From ffe6d928e3b6abade2be45f04f8892c0f4055f3f Mon Sep 17 00:00:00 2001 From: klinch0 <68821526+klinch0@users.noreply.github.com> Date: Mon, 17 Mar 2025 17:32:17 +0300 Subject: [PATCH] feature/add-cosi-resources (#6638) --- k8s/charts/seaweedfs/Chart.yaml | 2 +- k8s/charts/seaweedfs/templates/cosi-deployment.yaml | 6 +++++- k8s/charts/seaweedfs/values.yaml | 11 +++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/k8s/charts/seaweedfs/Chart.yaml b/k8s/charts/seaweedfs/Chart.yaml index 6f20d7a74..9d893a980 100644 --- a/k8s/charts/seaweedfs/Chart.yaml +++ b/k8s/charts/seaweedfs/Chart.yaml @@ -3,4 +3,4 @@ description: SeaweedFS name: seaweedfs appVersion: "3.85" # Dev note: Trigger a helm chart release by `git tag -a helm-` -version: 4.0.385 +version: 4.0.386 diff --git a/k8s/charts/seaweedfs/templates/cosi-deployment.yaml b/k8s/charts/seaweedfs/templates/cosi-deployment.yaml index 84b537eba..0e2e19477 100644 --- a/k8s/charts/seaweedfs/templates/cosi-deployment.yaml +++ b/k8s/charts/seaweedfs/templates/cosi-deployment.yaml @@ -140,6 +140,10 @@ spec: mountPath: /usr/local/share/ca-certificates/client/ {{- end }} {{ tpl .Values.cosi.extraVolumeMounts . | nindent 12 | trim }} + {{- with .Values.cosi.resources }} + resources: + {{- toYaml . | nindent 12 }} + {{- end }} - name: seaweedfs-cosi-sidecar image: "{{ .Values.cosi.sidecar.image }}" imagePullPolicy: {{ default "IfNotPresent" .Values.global.imagePullPolicy }} @@ -153,7 +157,7 @@ spec: volumeMounts: - mountPath: /var/lib/cosi name: socket - {{- with .Values.cosi.resources }} + {{- with .Values.cosi.sidecar.resources }} resources: {{- toYaml . | nindent 12 }} {{- end }} diff --git a/k8s/charts/seaweedfs/values.yaml b/k8s/charts/seaweedfs/values.yaml index 2269900ee..f2ed59b8b 100644 --- a/k8s/charts/seaweedfs/values.yaml +++ b/k8s/charts/seaweedfs/values.yaml @@ -962,6 +962,11 @@ cosi: sidecar: image: gcr.io/k8s-staging-sig-storage/objectstorage-sidecar/objectstorage-sidecar:v20230130-v0.1.0-24-gc0cf995 + # Resource requests, limits, etc. for the server cluster placement. This + # should map directly to the value of the resources field for a PodSpec, + # formatted as a multi-line string. By default no direct resource request + # is made. + resources: {} # enable user & permission to s3 (need to inject to all services) enableAuth: false @@ -975,6 +980,12 @@ cosi: extraVolumes: "" extraVolumeMounts: "" + # Resource requests, limits, etc. for the server cluster placement. This + # should map directly to the value of the resources field for a PodSpec, + # formatted as a multi-line string. By default no direct resource request + # is made. + resources: {} + certificates: commonName: "SeaweedFS CA" ipAddresses: []