Merge d4278d8791 into 534f4a9fb1

Merge branch 'master' into helmchart-add-probes
fix: timeN function return final closure not be called (#21615 )
2025-10-01 13:32:40 +02:00 · 2025-10-01 13:32:39 +02:00 · 2025-09-30 23:06:01 -07:00 · 2025-09-26 11:33:12 +02:00 · 2025-09-17 15:35:15 +02:00 · 2025-09-12 13:42:03 +02:00
5 changed files with 142 additions and 9 deletions
--- a/cmd/data-scanner-metric.go
+++ b/cmd/data-scanner-metric.go
@ -106,16 +106,14 @@ func (p *scannerMetrics) log(s scannerMetric, paths ...string) func(custom map[s

 // time n scanner actions.
 // Use for s < scannerMetricLastRealtime
-func (p *scannerMetrics) timeN(s scannerMetric) func(n int) func() {
+func (p *scannerMetrics) timeN(s scannerMetric) func(n int) {
 	startTime := time.Now()
-	return func(n int) func() {
-		return func() {
-			duration := time.Since(startTime)
+	return func(n int) {
+		duration := time.Since(startTime)

-			atomic.AddUint64(&p.operations[s], uint64(n))
-			if s < scannerMetricLastRealtime {
-				p.latency[s].add(duration)
-			}
+		atomic.AddUint64(&p.operations[s], uint64(n))
+		if s < scannerMetricLastRealtime {
+			p.latency[s].add(duration)
 		}
 	}
 }
--- a/helm/minio/Chart.yaml
+++ b/helm/minio/Chart.yaml
@ -1,7 +1,7 @@
 apiVersion: v1
 description: High Performance Object Storage
 name: minio
-version: 5.4.0
+version: 5.5.0
 appVersion: RELEASE.2024-12-18T13-15-44Z
 keywords:
  - minio
--- a/helm/minio/templates/deployment.yaml
+++ b/helm/minio/templates/deployment.yaml
@ -173,6 +173,44 @@ spec:
          securityContext: {{ toYaml . | nindent 12}}
          {{- end }}
          {{- end }}
+          {{- if .Values.customLivenessProbe }}
+          livenessProbe: {{- toYaml $.Values.customLivenessProbe | nindent 12 }}
+          {{- else if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /minio/health/live
+              port: {{ .Values.minioAPIPort }}
+              scheme: {{ ternary "HTTPS" "HTTP" .Values.tls.enabled | quote }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.customReadinessProbe }}
+          readinessProbe: {{- toYaml $.Values.customReadinessProbe | nindent 12 }}
+          {{- else if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            tcpSocket:
+              port: {{ .Values.minioAPIPort }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.customStartupProbe }}
+          startupProbe: {{- toYaml .Values.customStartupProbe | nindent 12 }}
+          {{- else if .Values.startupProbe.enabled }}
+          startupProbe:
+            tcpSocket:
+              port: {{ .Values.minioAPIPort }}
+            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.startupProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.startupProbe.successThreshold }}
+            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
+          {{- end }}
        {{- with .Values.extraContainers }}
          {{- if eq (typeOf .) "string" }}
            {{- tpl . $ | nindent 8 }}
--- a/helm/minio/templates/statefulset.yaml
+++ b/helm/minio/templates/statefulset.yaml
@ -191,6 +191,44 @@ spec:
          securityContext: {{ toYaml . | nindent 12}}
          {{- end }}
          {{- end }}
+          {{- if .Values.customLivenessProbe }}
+          livenessProbe: {{- toYaml $.Values.customLivenessProbe | nindent 12 }}
+          {{- else if .Values.livenessProbe.enabled }}
+          livenessProbe:
+            httpGet:
+              path: /minio/health/live
+              port: {{ .Values.minioAPIPort }}
+              scheme: {{ ternary "HTTPS" "HTTP" .Values.tls.enabled | quote }}
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.livenessProbe.successThreshold }}
+            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.customReadinessProbe }}
+          readinessProbe: {{- toYaml $.Values.customReadinessProbe | nindent 12 }}
+          {{- else if .Values.readinessProbe.enabled }}
+          readinessProbe:
+            tcpSocket:
+              port: {{ .Values.minioAPIPort }}
+            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.readinessProbe.successThreshold }}
+            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
+          {{- end }}
+          {{- if .Values.customStartupProbe }}
+          startupProbe: {{- toYaml .Values.customStartupProbe | nindent 12 }}
+          {{- else if .Values.startupProbe.enabled }}
+          startupProbe:
+            tcpSocket:
+              port: {{ .Values.minioAPIPort }}
+            initialDelaySeconds: {{ .Values.startupProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.startupProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}
+            successThreshold: {{ .Values.startupProbe.successThreshold }}
+            failureThreshold: {{ .Values.startupProbe.failureThreshold }}
+          {{- end }}
        {{- with .Values.extraContainers }}
          {{- if eq (typeOf .) "string" }}
            {{- tpl . $ | nindent 8 }}
--- a/helm/minio/values.yaml
+++ b/helm/minio/values.yaml
@ -296,6 +296,65 @@ resources:
  requests:
    memory: 16Gi

+## Configure extra options for liveness probe
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
+## livenessProbe.enabled Enable livenessProbe
+## livenessProbe.initialDelaySeconds Initial delay seconds for livenessProbe
+## livenessProbe.periodSeconds Period seconds for livenessProbe
+## livenessProbe.timeoutSeconds Timeout seconds for livenessProbe
+## livenessProbe.failureThreshold Failure threshold for livenessProbe
+## livenessProbe.successThreshold Success threshold for livenessProbe
+##
+livenessProbe:
+  enabled: false
+  initialDelaySeconds: 5
+  periodSeconds: 5
+  timeoutSeconds: 5
+  successThreshold: 1
+  failureThreshold: 5
+## Configure extra options for readiness probe
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
+## readinessProbe.enabled Enable readinessProbe
+## readinessProbe.initialDelaySeconds Initial delay seconds for readinessProbe
+## readinessProbe.periodSeconds Period seconds for readinessProbe
+## readinessProbe.timeoutSeconds Timeout seconds for readinessProbe
+## readinessProbe.failureThreshold Failure threshold for readinessProbe
+## readinessProbe.successThreshold Success threshold for readinessProbe
+##
+readinessProbe:
+  enabled: false
+  initialDelaySeconds: 5
+  periodSeconds: 5
+  timeoutSeconds: 1
+  successThreshold: 1
+  failureThreshold: 5
+## Configure extra options for startupProbe probe
+## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
+## startupProbe.enabled Enable startupProbe
+## startupProbe.initialDelaySeconds Initial delay seconds for startupProbe
+## startupProbe.periodSeconds Period seconds for startupProbe
+## startupProbe.timeoutSeconds Timeout seconds for startupProbe
+## startupProbe.failureThreshold Failure threshold for startupProbe
+## startupProbe.successThreshold Success threshold for startupProbe
+##
+startupProbe:
+  enabled: false
+  initialDelaySeconds: 0
+  periodSeconds: 10
+  timeoutSeconds: 5
+  successThreshold: 1
+  failureThreshold: 60
+
+## customLivenessProbe Override default liveness probe
+##
+customLivenessProbe: {}
+## customReadinessProbe Override default readiness probe
+##
+customReadinessProbe: {}
+## customStartupProbe Override default startup probe
+##
+customStartupProbe: {}
+
 ## List of policies to be created after minio install
 ##
 ## In addition to default policies [readonly|readwrite|writeonly|consoleAdmin|diagnostics]
Author	SHA1	Message	Date
Hendrik Ferber	9a2bae3f68	Merge `d4278d8791` into `534f4a9fb1`	2025-10-01 13:32:40 +02:00
Hendrik Ferber	d4278d8791	Merge branch 'master' into helmchart-add-probes	2025-10-01 13:32:39 +02:00
yangw	534f4a9fb1	fix: timeN function return final closure not be called (#21615 ) VulnCheck / Analysis (push) Has been cancelled Details	2025-09-30 23:06:01 -07:00
Hendrik Ferber	fa9b942eec	Merge branch 'master' into helmchart-add-probes	2025-09-26 11:33:12 +02:00
Hendrik Ferber	2ce62072c5	Merge branch 'master' into helmchart-add-probes	2025-09-17 15:35:15 +02:00
HaveFun83	7c80172352	[helm] add option to enable kubernetes probes	2025-09-12 13:42:03 +02:00