nelm-ready: public images overlays, nodeSelector fix, secrets

This commit is contained in:
ci 2026-09-11 14:28:16 +03:00
parent 7b548f3f0a
commit 1601958d7f
8 changed files with 69 additions and 22 deletions

6
.helm/Chart.yaml Normal file
View File

@ -0,0 +1,6 @@
apiVersion: v2
name: seaweedfs
description: SeaweedFS for nelm deploy
type: application
version: 1.0.0
appVersion: "3.99"

5
.helm/secret-values.yaml Normal file
View File

@ -0,0 +1,5 @@
seaweedfs:
s3config:
_default: 10009a37cbd5e565514171a687cf9261a8b2cc1dc79ffdf6e6aad88f9db9cbf536f73c8a15742f55bd5cbc710845f3b3dc5a8e66705e57d454f5c27b53b014e5df45a5e1b89ea767baa62e05305f30fd14bbeb0e29f6118aa65b9ae67bb67628b82578e07278464c4eca5d9a5b979fdef56994a1dce1d30acc99b187c118ff40b6dd4b628ba0b15dabf5395210e717a550fbfde6c85360fa60e52fbb48d213542bfcc0a7d46314a0bdf24f5c91a0a62b6162995cc0acde42507017ead87a0910d40b77c531f0f40f3710b4bc816e752ca4e1ee0951f352d707184c74628ccdcd5369
preprod: 10003aa0e4ce7bc2a5135b546cffdcf802d636b1e077f0130f01b01d028e670ad1e0fb815b3255264e88111703709625fc0866b62681364366fc5f01b1c9e1fce78a84840e742fc3afb9921640746cca71db367e68402be60910dd0711e03f6751b1a06619e012d56b4da92ce99ca3af089933ffc04bba542d443cbf1f87be0a613a13f8445426b37a5188638f0560bf6cd4ce7a55ebd32a0858ba929805f755dffc217124989e294f4a20d92c524fead287d8959c81b08e5736d07cfc5b60766bceee2bd95593274af5328caa499590cef457623047c06968c503f62abc7bae0334
prod: 1000a2e0125d14ce5c987bffcd30bb6c2a7a3a5bcb793bfaa65d1527cef16e4db3ea2b2be4b5046ff6bb6e61670a2197f2c85288035205c26d6f0970637a13f0292cfeb6ed44291c2f357360ea20717d0204cc6a07b642e7c2391d09e79845bc5a511607426a4f93c772dc28b722c044bc3bcc06d2233f4585803f290c7744db4c6848b711539491d4a149f42b8b1800b03f48555ca38c5a4c2bfc966138f82111f68d141cc0a1544f83b4b15758b97251e84d975653559e12e99017c5f3e6f34194dfd8c6c870ca94ad6392a200f4823ecf6cf0cf2a7f25142709558aebd3c989a9

View File

@ -3,5 +3,3 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ .Chart.Name }}-sa name: {{ .Chart.Name }}-sa
annotations:
werf.io/weight: "-31"

View File

@ -1,3 +1,4 @@
{{- if .Values.secretsStore.enabled }}
--- ---
apiVersion: deckhouse.io/v1alpha1 apiVersion: deckhouse.io/v1alpha1
kind: SecretsStoreImport kind: SecretsStoreImport
@ -5,9 +6,10 @@ metadata:
name: {{ .Chart.Name }}-ssi name: {{ .Chart.Name }}-ssi
spec: spec:
type: CSI type: CSI
role: "{{ .Values.werf.env }}-{{ .Chart.Name }}-role" role: "{{ .Values.env }}-{{ .Chart.Name }}-role"
files: files:
- name: "s3.json" - name: "s3.json"
source: source:
path: "{{ .Values.werf.env }}/data/{{ .Chart.Name }}" path: "{{ .Values.env }}/data/{{ .Chart.Name }}"
key: "CONFIG" key: "CONFIG"
{{- end }}

View File

@ -1,5 +1,14 @@
{{- $nodeSelector := dig .Values.werf.env .Values.seaweedfs.nodeSelector._default .Values.seaweedfs.nodeSelector }} {{- $nodeSelector := dig .Values.env .Values.seaweedfs.nodeSelector._default .Values.seaweedfs.nodeSelector }}
{{- $tolerations := dig .Values.werf.env .Values.seaweedfs.tolerations._default .Values.seaweedfs.tolerations }} {{- $tolerations := dig .Values.env .Values.seaweedfs.tolerations._default .Values.seaweedfs.tolerations }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ .Chart.Name }}-s3
type: Opaque
stringData:
s3.json: |
{{ dig .Values.env .Values.seaweedfs.s3config._default .Values.seaweedfs.s3config | nindent 4 }}
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
@ -9,6 +18,7 @@ metadata:
app: {{ .Chart.Name }} app: {{ .Chart.Name }}
spec: spec:
replicas: 1 replicas: 1
serviceName: {{ .Chart.Name }}
selector: selector:
matchLabels: matchLabels:
app: {{ .Chart.Name }} app: {{ .Chart.Name }}
@ -16,13 +26,17 @@ spec:
metadata: metadata:
labels: labels:
app: {{ .Chart.Name }} app: {{ .Chart.Name }}
{{- if .Values.secretsStore.enabled }}
annotations: annotations:
secrets-store.deckhouse.io/role: "{{ .Values.werf.env }}-{{ .Chart.Name }}-role" secrets-store.deckhouse.io/role: "{{ .Values.env }}-{{ .Chart.Name }}-role"
secrets-store.deckhouse.io/env-from-path: "{{ .Values.werf.env }}/data/{{ .Chart.Name }}" secrets-store.deckhouse.io/env-from-path: "{{ .Values.env }}/data/{{ .Chart.Name }}"
{{- end }}
spec: spec:
serviceAccountName: {{ .Chart.Name }}-sa serviceAccountName: {{ .Chart.Name }}-sa
{{- with .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
- name: registrysecret {{- toYaml . | nindent 8 }}
{{- end }}
{{- if $nodeSelector }} {{- if $nodeSelector }}
nodeSelector: {{ toYaml $nodeSelector | nindent 8 }} nodeSelector: {{ toYaml $nodeSelector | nindent 8 }}
{{- end }} {{- end }}
@ -31,7 +45,7 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: seaweedfs - name: seaweedfs
image: {{ .Values.werf.image.seaweedfs }} image: {{ .Values.image.seaweedfs }}
command: command:
- weed - weed
- server - server
@ -43,10 +57,10 @@ spec:
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
resources: resources:
requests: requests:
cpu: {{ dig .Values.werf.env .Values.seaweedfs.resources.requests.cpu._default .Values.seaweedfs.resources.requests.cpu }} cpu: {{ dig .Values.env .Values.seaweedfs.resources.requests.cpu._default .Values.seaweedfs.resources.requests.cpu }}
memory: {{ dig .Values.werf.env .Values.seaweedfs.resources.requests.memory._default .Values.seaweedfs.resources.requests.memory }} memory: {{ dig .Values.env .Values.seaweedfs.resources.requests.memory._default .Values.seaweedfs.resources.requests.memory }}
limits: limits:
memory: {{ dig .Values.werf.env .Values.seaweedfs.resources.limits.memory._default .Values.seaweedfs.resources.limits.memory }} memory: {{ dig .Values.env .Values.seaweedfs.resources.limits.memory._default .Values.seaweedfs.resources.limits.memory }}
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /data mountPath: /data
@ -55,25 +69,30 @@ spec:
mountPath: "/mnt/secrets" mountPath: "/mnt/secrets"
readinessProbe: readinessProbe:
tcpSocket: tcpSocket:
port: {{ dig .Values.werf.env .Values.seaweedfs.port._default .Values.seaweedfs.port }} port: {{ dig .Values.env .Values.seaweedfs.port._default .Values.seaweedfs.port }}
initialDelaySeconds: 5 initialDelaySeconds: 5
timeoutSeconds: 1 timeoutSeconds: 1
livenessProbe: livenessProbe:
tcpSocket: tcpSocket:
port: {{ dig .Values.werf.env .Values.seaweedfs.port._default .Values.seaweedfs.port }} port: {{ dig .Values.env .Values.seaweedfs.port._default .Values.seaweedfs.port }}
initialDelaySeconds: 30 initialDelaySeconds: 30
periodSeconds: 5 periodSeconds: 5
ports: ports:
- name: app - name: app
containerPort: {{ dig .Values.werf.env .Values.seaweedfs.port._default .Values.seaweedfs.port }} containerPort: {{ dig .Values.env .Values.seaweedfs.port._default .Values.seaweedfs.port }}
- name: http-metrics - name: http-metrics
containerPort: {{ .Values.seaweedfs.metricsPort }} containerPort: {{ .Values.seaweedfs.metricsPort }}
volumes: volumes:
- name: secrets - name: secrets
{{- if .Values.secretsStore.enabled }}
csi: csi:
driver: secrets-store.csi.deckhouse.io driver: secrets-store.csi.deckhouse.io
volumeAttributes: volumeAttributes:
secretsStoreImport: {{ .Chart.Name }}-ssi secretsStoreImport: {{ .Chart.Name }}-ssi
{{- else }}
secret:
secretName: {{ .Chart.Name }}-s3
{{- end }}
volumeClaimTemplates: volumeClaimTemplates:
- metadata: - metadata:
name: data name: data
@ -82,8 +101,8 @@ spec:
- ReadWriteOnce - ReadWriteOnce
resources: resources:
requests: requests:
storage: {{ dig .Values.werf.env .Values.seaweedfs.storage._default .Values.seaweedfs.storage }} storage: {{ dig .Values.env .Values.seaweedfs.storage._default .Values.seaweedfs.storage }}
storageClassName: {{ dig .Values.werf.env .Values.seaweedfs.storageClassName._default .Values.seaweedfs.storageClassName }} storageClassName: {{ dig .Values.env .Values.seaweedfs.storageClassName._default .Values.seaweedfs.storageClassName }}
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
@ -96,6 +115,6 @@ spec:
app: {{ .Chart.Name }} app: {{ .Chart.Name }}
ports: ports:
- name: app - name: app
port: {{ dig .Values.werf.env .Values.seaweedfs.port._default .Values.seaweedfs.port }} port: {{ dig .Values.env .Values.seaweedfs.port._default .Values.seaweedfs.port }}
- name: http-metrics - name: http-metrics
port: {{ .Values.seaweedfs.metricsPort }} port: {{ .Values.seaweedfs.metricsPort }}

3
.helm/values-public.yaml Normal file
View File

@ -0,0 +1,3 @@
image:
seaweedfs: docker.io/chrislusf/seaweedfs:3.99
imagePullSecrets: []

View File

@ -1,3 +1,14 @@
global:
cluster: ""
env: dev
imagePullSecrets:
- name: registrysecret
image:
seaweedfs: 192.168.10.68:5000/chrislusf/seaweedfs:3.99
seaweedfs: seaweedfs:
port: port:
_default: "8333" _default: "8333"
@ -7,7 +18,7 @@ seaweedfs:
preprod: 50Gi preprod: 50Gi
prod: 100Gi prod: 100Gi
storageClassName: storageClassName:
_default: local-storage-class-worker _default: localpath
resources: resources:
requests: requests:
cpu: cpu:
@ -21,9 +32,11 @@ seaweedfs:
_default: 1Gi _default: 1Gi
preprod: 2Gi preprod: 2Gi
prod: 4Gi prod: 4Gi
nodeSelector: nodeSelector:
_default: _default:
node-role.deckhouse.io/worker: "" node-role.kubernetes.io/worker: ""
tolerations: tolerations:
_default: [] _default: []
secretsStore:
enabled: false

1
Dockerfile Normal file
View File

@ -0,0 +1 @@
FROM docker.io/chrislusf/seaweedfs:3.99