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.

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

HDDS-11618. Enable HA modes for OM and SCM #10

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ spec:
ports:
- name: ui
port: {{ .Values.datanode.service.port }}
- name: ratis-ipc
port: 9858
- name: ipc
port: 9859
Comment on lines +31 to +34
Copy link

@ptlrs ptlrs Nov 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the port numbers in all the services and statefulsets be referenced from the values.yaml file? We would like to avoid hardcoding them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes definitely! I just proposed this. This was also my personal question ^^

selector:
{{- include "ozone.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: datanode
4 changes: 4 additions & 0 deletions charts/ozone/templates/datanode/datanode-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ spec:
ports:
- name: ui
containerPort: {{ .Values.datanode.service.port }}
- name: ratis-ipc
containerPort: 9858
- name: ipc
containerPort: 9859
livenessProbe:
httpGet:
path: /
Expand Down
2 changes: 1 addition & 1 deletion charts/ozone/templates/om/om-service-headless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
port: {{ .Values.om.service.port }}
{{- if gt (int .Values.om.replicas) 1 }}
- name: ratis
port: {{ .Values.om.service.ratisPort }}
port: 9872
{{- end }}
selector:
{{- include "ozone.selectorLabels" . | nindent 4 }}
Expand Down
4 changes: 4 additions & 0 deletions charts/ozone/templates/om/om-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ spec:
containerPort: 9862
- name: ui
containerPort: {{ .Values.om.service.port }}
{{- if gt (int .Values.om.replicas) 1 }}
- name: ratis
containerPort: 9872
{{- end }}
livenessProbe:
httpGet:
path: /
Expand Down
10 changes: 9 additions & 1 deletion charts/ozone/templates/scm/scm-service-headless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,17 @@ spec:
ports:
- name: ui
port: {{ .Values.scm.service.port }}
- name: rpc-datanode
port: 9861
- name: block-client
port: 9863
- name: rpc-client
port: 9860
{{- if gt (int .Values.scm.replicas) 1 }}
- name: ratis
port: {{ .Values.om.service.ratisPort }}
port: 9894
- name: grpc
port: 9895
{{- end }}
selector:
{{- include "ozone.selectorLabels" . | nindent 4 }}
Expand Down
8 changes: 8 additions & 0 deletions charts/ozone/templates/scm/scm-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,18 @@ spec:
ports:
- name: rpc-client
containerPort: 9860
- name: block-client
containerPort: 9863
- name: rpc-datanode
containerPort: 9861
- name: ui
containerPort: {{ .Values.scm.service.port }}
{{- if gt (int .Values.scm.replicas) 1 }}
- name: ratis
containerPort: 9894
- name: grpc
containerPort: 9895
{{- end }}
Comment on lines +110 to +115
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are exposing ports, we should also have a readiness probe to toggle access to these ports in a separate Jira.

livenessProbe:
httpGet:
path: /
Expand Down
2 changes: 0 additions & 2 deletions charts/ozone/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ om:
type: ClusterIP
port: 9874
nodePort: ~
ratisPort: 9894
# Ozone Manager persistence
persistence:
# Enable persistence
Expand Down Expand Up @@ -202,7 +201,6 @@ scm:
type: ClusterIP
port: 9876
nodePort: ~
ratisPort: 9894
# Storage Container Manager persistence
persistence:
# Enable persistence
Expand Down