Skip to content

Commit 2a8a8a4

Browse files
committed
[seaweedfs] Traffic locality for seaweedfs
Signed-off-by: nbykov0 <[email protected]>
1 parent 6ca8011 commit 2a8a8a4

4 files changed

Lines changed: 76 additions & 9 deletions

File tree

‎packages/system/seaweedfs/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ update:
1212
sed -i.bak "/ARG VERSION/ s|=.*|=$${version}|g" images/seaweedfs/Dockerfile && \
1313
rm -f images/seaweedfs/Dockerfile.bak
1414
patch --no-backup-if-mismatch -p4 < patches/resize-api-server-annotation.diff
15+
patch --no-backup-if-mismatch -p4 < patches/s3-traffic-distribution.patch
1516
#patch --no-backup-if-mismatch -p4 < patches/retention-policy-delete.yaml
1617

1718
image:

‎packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ metadata:
1414
{{- toYaml .Values.s3.annotations | nindent 4 }}
1515
{{- end }}
1616
spec:
17+
trafficDistribution: PreferClose
1718
internalTrafficPolicy: {{ .Values.s3.internalTrafficPolicy | default "Cluster" }}
1819
ports:
1920
- name: "swfs-s3"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
2+
index 8afd4865..86e0424e 100644
3+
--- a/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
4+
+++ b/packages/system/seaweedfs/charts/seaweedfs/templates/s3/s3-service.yaml
5+
@@ -14,6 +14,7 @@ metadata:
6+
{{- toYaml .Values.s3.annotations | nindent 4 }}
7+
{{- end }}
8+
spec:
9+
+ trafficDistribution: PreferClose
10+
internalTrafficPolicy: {{ .Values.s3.internalTrafficPolicy | default "Cluster" }}
11+
ports:
12+
- name: "swfs-s3"

‎packages/system/seaweedfs/values.yaml‎

Lines changed: 62 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
global:
22
enableSecurity: true
33
serviceAccountName: "tenant-foo-seaweedfs"
4-
imageName: "seaweedfs"
54
extraEnvironmentVars:
65
WEED_CLUSTER_SW_MASTER: "seaweedfs-master:9333"
76
WEED_CLUSTER_SW_FILER: "seaweedfs-filer-client:8888"
87
monitoring:
98
enabled: true
109
seaweedfs:
11-
image:
12-
tag: "latest@sha256:944e9bff98b088773847270238b63ce57dc5291054814d08e0226a139b3affb2"
13-
registry: ghcr.io/cozystack/cozystack
1410
master:
1511
volumeSizeLimitMB: 30000
1612
replicas: 3
@@ -75,7 +71,7 @@ seaweedfs:
7571
name: seaweedfs-db-app
7672
s3:
7773
replicas: 2
78-
enabled: true
74+
enabled: false
7975
port: 8333
8076
httpsPort: 0
8177
# Suffix of the host name, {bucket}.{domainName}
@@ -87,20 +83,24 @@ seaweedfs:
8783
existingConfigSecret: null
8884
auditLogConfig: {}
8985
s3:
90-
enabled: false
86+
enabled: true
87+
replicas: 2
88+
port: 8333
9189
extraArgs:
9290
- -idleTimeout=60
9391
enableAuth: false
9492
readinessProbe:
95-
scheme: HTTPS
93+
httpGet:
94+
scheme: HTTPS
9695
livenessProbe:
97-
scheme: HTTPS
96+
httpGet:
97+
scheme: HTTPS
9898
logs:
9999
type: ""
100100
ingress:
101101
enabled: true
102102
className: "tenant-root"
103-
host: "seaweedfs2.demo.cozystack.io"
103+
host: "seaweedfs.demo.cozystack.io"
104104
annotations:
105105
nginx.ingress.kubernetes.io/proxy-body-size: "0"
106106
nginx.ingress.kubernetes.io/proxy-buffering: "off"
@@ -110,12 +110,65 @@ seaweedfs:
110110
nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
111111
nginx.ingress.kubernetes.io/client-body-timeout: "3600"
112112
nginx.ingress.kubernetes.io/client-header-timeout: "120"
113+
nginx.ingress.kubernetes.io/service-upstream: "true"
113114
acme.cert-manager.io/http01-ingress-class: tenant-root
114115
cert-manager.io/cluster-issuer: letsencrypt-prod
115116
tls:
116117
- hosts:
117118
- seaweedfs.demo.cozystack.io
118119
secretName: seaweedfs-s3-ingress-tls
120+
affinity: |
121+
podAntiAffinity:
122+
preferredDuringSchedulingIgnoredDuringExecution:
123+
- weight: 10
124+
podAffinityTerm:
125+
labelSelector:
126+
matchExpressions:
127+
- key: app.kubernetes.io/name
128+
operator: In
129+
values:
130+
- '{{ template "seaweedfs.name" . }}'
131+
- key: app.kubernetes.io/instance
132+
operator: In
133+
values:
134+
- '{{ .Release.Name }}'
135+
- key: app.kubernetes.io/component
136+
operator: In
137+
values:
138+
- s3
139+
topologyKey: kubernetes.io/hostname
140+
- weight: 100
141+
podAffinityTerm:
142+
labelSelector:
143+
matchExpressions:
144+
- key: app.kubernetes.io/name
145+
operator: In
146+
values:
147+
- '{{ template "seaweedfs.name" . }}'
148+
- key: app.kubernetes.io/instance
149+
operator: In
150+
values:
151+
- '{{ .Release.Name }}'
152+
- key: app.kubernetes.io/component
153+
operator: In
154+
values:
155+
- s3
156+
topologyKey: topology.kubernetes.io/zone
157+
podAffinity:
158+
preferredDuringSchedulingIgnoredDuringExecution:
159+
- weight: 20
160+
podAffinityTerm:
161+
labelSelector:
162+
matchExpressions:
163+
- key: app.kubernetes.io/name
164+
operator: In
165+
values:
166+
- ingress-nginx
167+
- key: app.kubernetes.io/component
168+
operator: In
169+
values:
170+
- controller
171+
topologyKey: kubernetes.io/hostname
119172
cosi:
120173
enabled: true
121174
podLabels:

0 commit comments

Comments
 (0)