Skip to content

Commit 85fbf6b

Browse files
committed
Add image tag to kustomize
1 parent 1aa1ee7 commit 85fbf6b

File tree

6 files changed

+53
-26
lines changed

6 files changed

+53
-26
lines changed

manifests/kustomize/third-party/seaweedfs/base/seaweedfs/kustomization.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ kind: Kustomization
33
namespace: kubeflow
44

55
resources:
6-
- seaweedfs-deployment.yaml
7-
- seaweedfs-pvc.yaml
8-
- seaweedfs-networkpolicy.yaml
9-
- seaweedfs-service.yaml
106
- seaweedfs-service-account.yaml
117
- minio-service.yaml
128
- mlpipeline-minio-artifact-secret.yaml

manifests/kustomize/third-party/seaweedfs/ha/base/filer-statefulset.yaml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,23 @@ spec:
3333
serviceAccountName: seaweedfs
3434
terminationGracePeriodSeconds: 60
3535
securityContext:
36-
fsGroup: 1001
36+
seccompProfile:
37+
type: RuntimeDefault
38+
fsGroup: 1000
3739
containers:
3840
- name: seaweedfs-filer
39-
image: 'chrislusf/seaweedfs:3.92'
41+
env:
42+
- name: AWS_ACCESS_KEY_ID
43+
valueFrom:
44+
secretKeyRef:
45+
name: mlpipeline-minio-artifact
46+
key: accesskey
47+
- name: AWS_SECRET_ACCESS_KEY
48+
valueFrom:
49+
secretKeyRef:
50+
name: mlpipeline-minio-artifact
51+
key: secretkey
52+
image: 'chrislusf/seaweedfs'
4053
args:
4154
- 'filer'
4255
- '-port=8888'
@@ -75,8 +88,8 @@ spec:
7588
privileged: false
7689
runAsNonRoot: true
7790
# image defaults to root user
78-
runAsUser: 1001
79-
runAsGroup: 1001
91+
runAsUser: 1000
92+
runAsGroup: 1000
8093
capabilities:
8194
drop:
8295
- ALL
@@ -88,4 +101,4 @@ spec:
88101
- ReadWriteOnce
89102
resources:
90103
requests:
91-
storage: 25Gi
104+
storage: 20Gi

manifests/kustomize/third-party/seaweedfs/ha/base/kustomization.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,7 @@ patches:
3232
- op: add
3333
path: /spec/selector/component
3434
value: s3
35+
36+
images:
37+
- name: chrislusf/seaweedfs
38+
newTag: '4.00'

manifests/kustomize/third-party/seaweedfs/ha/base/master-statefulset.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,16 @@ spec:
3333
serviceAccountName: seaweedfs
3434
terminationGracePeriodSeconds: 60
3535
securityContext:
36-
fsGroup: 1001
36+
seccompProfile:
37+
type: RuntimeDefault
38+
fsGroup: 1000
3739
containers:
3840
- name: seaweedfs-master
39-
image: 'chrislusf/seaweedfs:3.92'
41+
image: 'chrislusf/seaweedfs'
4042
args:
4143
- 'master'
4244
- '-mdir=/data'
43-
- '-defaultReplication=001'
45+
- '-defaultReplication=001' # replicate data to at least another volume (same "rack" and "datacenter")
4446
- '-volumePreallocate=false'
4547
- '-ip=$(POD_NAME).seaweedfs-master.$(NAMESPACE)'
4648
- '-ip.bind=0.0.0.0'
@@ -84,8 +86,8 @@ spec:
8486
privileged: false
8587
runAsNonRoot: true
8688
# image defaults to root user
87-
runAsUser: 1001
88-
runAsGroup: 1001
89+
runAsUser: 1000
90+
runAsGroup: 1000
8991
capabilities:
9092
drop:
9193
- ALL

manifests/kustomize/third-party/seaweedfs/ha/base/s3-gateway-deployment.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ apiVersion: apps/v1
22
kind: Deployment
33
metadata:
44
name: seaweedfs-s3
5-
namespace: kubeflow
65
labels:
76
app: seaweedfs
87
component: s3
@@ -18,11 +17,22 @@ spec:
1817
app: seaweedfs
1918
component: s3
2019
spec:
20+
affinity:
21+
podAntiAffinity:
22+
requiredDuringSchedulingIgnoredDuringExecution:
23+
- labelSelector:
24+
matchLabels:
25+
app: seaweedfs
26+
component: s3
27+
topologyKey: kubernetes.io/hostname
2128
terminationGracePeriodSeconds: 10
2229
serviceAccountName: seaweedfs
30+
securityContext:
31+
seccompProfile:
32+
type: RuntimeDefault
2333
containers:
2434
- name: seaweedfs
25-
image: chrislusf/seaweedfs:3.92
35+
image: chrislusf/seaweedfs
2636
env:
2737
- name: POD_IP
2838
valueFrom:
@@ -64,8 +74,8 @@ spec:
6474
privileged: false
6575
runAsNonRoot: true
6676
# image defaults to root user
67-
runAsUser: 1001
68-
runAsGroup: 1001
77+
runAsUser: 1000
78+
runAsGroup: 1000
6979
capabilities:
7080
drop:
7181
- ALL

manifests/kustomize/third-party/seaweedfs/ha/base/volume-statefulset.yaml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,22 @@ spec:
3333
serviceAccountName: seaweedfs
3434
terminationGracePeriodSeconds: 150
3535
securityContext:
36-
fsGroup: 1001
36+
seccompProfile:
37+
type: RuntimeDefault
38+
fsGroup: 1000
3739
containers:
3840
- name: seaweedfs
39-
image: chrislusf/seaweedfs:3.92
41+
image: chrislusf/seaweedfs
4042
args:
4143
- volume
4244
- -port=8080
43-
- -dir /data1
45+
- -dir /data
4446
- -ip.bind=0.0.0.0
4547
- -ip=$(POD_NAME).seaweedfs-volume.$(NAMESPACE)
4648
- -mserver=seaweedfs-master-0.seaweedfs-master.$(NAMESPACE):9333,seaweedfs-master-1.seaweedfs-master.$(NAMESPACE):9333,seaweedfs-master-2.seaweedfs-master.$(NAMESPACE):9333
4749
volumeMounts:
48-
- mountPath: /data1/
49-
name: swfs-vol1
50+
- mountPath: /data/
51+
name: swfs-vol
5052
ports:
5153
- containerPort: 8080
5254
name: swfs-vol
@@ -90,16 +92,16 @@ spec:
9092
privileged: false
9193
runAsNonRoot: true
9294
# image defaults to root user
93-
runAsUser: 1001
94-
runAsGroup: 1001
95+
runAsUser: 1000
96+
runAsGroup: 1000
9597
capabilities:
9698
drop:
9799
- ALL
98100
volumeClaimTemplates:
99101
- apiVersion: v1
100102
kind: PersistentVolumeClaim
101103
metadata:
102-
name: swfs-vol1
104+
name: swfs-vol
103105
spec:
104106
accessModes:
105107
- ReadWriteOnce

0 commit comments

Comments
 (0)