From 62d50914d7b1b92d9b42e0070d9501aec4348947 Mon Sep 17 00:00:00 2001
From: hitesh-wani-px <hwani+github@purestorage.com>
Date: Mon, 18 May 2026 13:12:28 +0000
Subject: [PATCH] Add periodicDiags.interval in clusterDiags

---
 .../portworx/templates/storage-cluster.yaml   |  4 ++
 charts/portworx/values.yaml                   |  2 +
 .../storagecluster_helm_template_test.go      | 20 ++++++++++
 ...ter_cluster_diags_with_periodic_diags.yaml | 39 +++++++++++++++++++
 4 files changed, 65 insertions(+)
 create mode 100644 test/portworx/testspec/storagecluster_cluster_diags_with_periodic_diags.yaml

diff --git a/charts/portworx/templates/storage-cluster.yaml b/charts/portworx/templates/storage-cluster.yaml
index d7b7a8b23..f60e2c1a6 100644
--- a/charts/portworx/templates/storage-cluster.yaml
+++ b/charts/portworx/templates/storage-cluster.yaml
@@ -740,6 +740,10 @@ spec:
     {{- if ne .Values.clusterDiags.image "" }}
     image: {{ .Values.clusterDiags.image }}
     {{- end }}
+    {{- if and .Values.clusterDiags.periodicDiags (ne (.Values.clusterDiags.periodicDiags.interval | default "") "") }}
+    periodicDiags:
+      interval: {{ .Values.clusterDiags.periodicDiags.interval | quote }}
+    {{- end }}
   {{- end }}
 
 {{- end }}
diff --git a/charts/portworx/values.yaml b/charts/portworx/values.yaml
index 2ab6db3b5..37ad4473f 100644
--- a/charts/portworx/values.yaml
+++ b/charts/portworx/values.yaml
@@ -277,6 +277,8 @@ taintBasedScheduling:
 clusterDiags:
   enabled: true                       # Enabled decides whether cluster diags needs to be enabled
   image: ""                           # image is docker image of the cluster diags container
+  periodicDiags:
+    interval: ""                      # Interval between periodic pod diag collections (e.g. "4h"). Empty means use default (4h).
 
 tolerations:                          # Add tolerations
   # - key: "key"
diff --git a/test/portworx/storagecluster_helm_template_test.go b/test/portworx/storagecluster_helm_template_test.go
index 3dda39546..986c291de 100644
--- a/test/portworx/storagecluster_helm_template_test.go
+++ b/test/portworx/storagecluster_helm_template_test.go
@@ -571,6 +571,26 @@ func TestStorageClusterHelmTemplate(t *testing.T) {
 				},
 			},
 		},
+		{
+			name:           "TestClusterDiagsWithPeriodicDiagsInterval",
+			resultFileName: "storagecluster_cluster_diags_with_periodic_diags.yaml",
+			helmOption: &helm.Options{
+				SetValues: map[string]string{
+					"clusterDiags.enabled":                   "true",
+					"clusterDiags.periodicDiags.interval":    "4h",
+				},
+			},
+		},
+		{
+			name:           "TestClusterDiagsWithEmptyPeriodicDiagsInterval",
+			resultFileName: "storagecluster_cluster_diags_enabled.yaml",
+			helmOption: &helm.Options{
+				SetValues: map[string]string{
+					"clusterDiags.enabled":                   "true",
+					"clusterDiags.periodicDiags.interval":    "",
+				},
+			},
+		},
 		{
 			name:           "TestPurePlatform",
 			resultFileName: "storagecluster_pure_platform.yaml",
diff --git a/test/portworx/testspec/storagecluster_cluster_diags_with_periodic_diags.yaml b/test/portworx/testspec/storagecluster_cluster_diags_with_periodic_diags.yaml
new file mode 100644
index 000000000..2bb1b59fd
--- /dev/null
+++ b/test/portworx/testspec/storagecluster_cluster_diags_with_periodic_diags.yaml
@@ -0,0 +1,39 @@
+kind: StorageCluster
+apiVersion: core.libopenstorage.org/v1
+metadata:
+  name: "mycluster"
+  namespace: portworx
+  annotations:
+  labels:
+    heritage: "Helm"
+    release: "my-release"
+    app.kubernetes.io/managed-by: "Helm"
+    app.kubernetes.io/instance: "my-release"
+spec:
+  image: portworx/oci-monitor:3.6.1
+  imagePullPolicy: Always
+
+  kvdb:
+    internal: true
+    enableTLS: true
+  certManager:
+    enabled: true
+  storage:
+    useAll: true
+  secretsProvider: k8s
+
+  stork:
+    enabled: true
+  monitoring:
+    telemetry:
+      enabled: true
+      metricsCollector:
+        enabled: true
+  csi:
+    enabled: true
+  autopilot:
+    enabled: true
+  clusterDiags:
+    enabled: true
+    periodicDiags:
+      interval: "4h"