Merge branch 'master' into cloud-storage

config/configStructs/tapConfig.go

@@ -308,11 +308,22 @@ type RawCaptureConfig struct {
 	StorageSize string `yaml:"storageSize" json:"storageSize" default:"1Gi"`
 }
 
-type SnapshotsConfig struct {
+type SnapshotsLocalConfig struct {
 	StorageClass string `yaml:"storageClass" json:"storageClass" default:""`
 	StorageSize  string `yaml:"storageSize" json:"storageSize" default:"20Gi"`
 }
 
+type SnapshotsCloudConfig struct {
+	Provider   string   `yaml:"provider" json:"provider" default:""`
+	ConfigMaps []string `yaml:"configMaps" json:"configMaps" default:"[]"`
+	Secrets    []string `yaml:"secrets" json:"secrets" default:"[]"`
+}
+
+type SnapshotsConfig struct {
+	Local SnapshotsLocalConfig `yaml:"local" json:"local"`
+	Cloud SnapshotsCloudConfig `yaml:"cloud" json:"cloud"`
+}
+
 type DelayedDissectionConfig struct {
 	CPU    string `yaml:"cpu" json:"cpu" default:"1"`
 	Memory string `yaml:"memory" json:"memory" default:"4Gi"`

helm-chart/README.md

@@ -143,8 +143,11 @@ Example for overriding image names:
 | `tap.capture.raw.enabled`                           | Enable raw capture of packets and syscalls to disk for offline analysis      | `true`                                                                                                                                                                                                                                          |
 | `tap.capture.raw.storageSize`                       | Maximum storage size for raw capture files (supports K8s quantity format: `1Gi`, `500Mi`, etc.)     | `1Gi`                                                                                                                                                                                                                                            |
 | `tap.capture.dbMaxSize`                           | Maximum size for capture database (e.g., `4Gi`, `2000Mi`). When empty, automatically uses 80% of allocated storage (`tap.storageLimit`).     | `""`                                                                                                                                                                                                                                             |
-| `tap.snapshots.storageClass`                      | Storage class for snapshots volume. When empty, uses `emptyDir`. When set, creates a PVC with this storage class | `""`                                                                                                                                                                                                                                             |
+| `tap.snapshots.local.storageClass`                | Storage class for local snapshots volume. When empty, uses `emptyDir`. When set, creates a PVC with this storage class | `""`                                                                                                                                                                                                                                             |
-| `tap.snapshots.storageSize`                       | Storage size for snapshots volume (supports K8s quantity format: `1Gi`, `500Mi`, etc.)     | `10Gi`                                                                                                                                                                                                                                            |
+| `tap.snapshots.local.storageSize`                 | Storage size for local snapshots volume (supports K8s quantity format: `1Gi`, `500Mi`, etc.)     | `20Gi`                                                                                                                                                                                                                                            |
+| `tap.snapshots.cloud.provider`                    | Cloud storage provider for snapshots (e.g. `s3`). Empty string disables cloud storage. | `""`                                                                                                                                                                                                                                             |
+| `tap.snapshots.cloud.configMaps`                  | Names of ConfigMaps containing cloud storage environment variables | `[]`                                                                                                                                                                                                                                             |
+| `tap.snapshots.cloud.secrets`                     | Names of Secrets containing cloud storage credentials | `[]`                                                                                                                                                                                                                                             |
 | `tap.release.repo`                        | URL of the Helm chart repository              | `https://helm.kubeshark.com`                                                                                                                                                                                                                        |
 | `tap.release.name`                        | Helm release name                             | `kubeshark`                                                                                                                                                                                                                                      |
 | `tap.release.namespace`                   | Helm release namespace                        | `default`                                                                                                                                                                                                                                        |

helm-chart/templates/04-hub-deployment.yaml

@@ -61,12 +61,24 @@ spec:
             {{- end }}
             - -cloud-api-url
             - '{{ .Values.cloudApiUrl }}'
-          {{- if .Values.tap.secrets }}
+            {{- if .Values.tap.snapshots.cloud.provider }}
+            - -cloud-storage-provider
+            - '{{ .Values.tap.snapshots.cloud.provider }}'
+            {{- end }}
+          {{- if or .Values.tap.secrets .Values.tap.snapshots.cloud.configMaps .Values.tap.snapshots.cloud.secrets }}
           envFrom:
             {{- range .Values.tap.secrets }}
             - secretRef:
                 name: {{ . }}
             {{- end }}
+            {{- range .Values.tap.snapshots.cloud.configMaps }}
+            - configMapRef:
+                name: {{ . }}
+            {{- end }}
+            {{- range .Values.tap.snapshots.cloud.secrets }}
+            - secretRef:
+                name: {{ . }}
+            {{- end }}
           {{- end }}
           env:
           - name: POD_NAME
@@ -188,10 +200,10 @@ spec:
               - key: AUTH_SAML_X509_KEY
                 path: kubeshark.key
       - name: snapshots-volume
-        {{- if .Values.tap.snapshots.storageClass }}
+        {{- if .Values.tap.snapshots.local.storageClass }}
         persistentVolumeClaim:
           claimName: {{ include "kubeshark.name" . }}-snapshots-pvc
         {{- else }}
         emptyDir:
-          sizeLimit: {{ .Values.tap.snapshots.storageSize }}
+          sizeLimit: {{ .Values.tap.snapshots.local.storageSize }}
         {{- end }}

helm-chart/templates/09-snapshots-pvc.yaml

@@ -1,5 +1,5 @@
 ---
-{{- if .Values.tap.snapshots.storageClass }}
+{{- if .Values.tap.snapshots.local.storageClass }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -16,7 +16,7 @@ spec:
     - ReadWriteOnce
   resources:
     requests:
-      storage: {{ .Values.tap.snapshots.storageSize }}
+      storage: {{ .Values.tap.snapshots.local.storageSize }}
-  storageClassName: {{ .Values.tap.snapshots.storageClass }}
+  storageClassName: {{ .Values.tap.snapshots.local.storageClass }}
 status: {}
 {{- end }}

helm-chart/values.yaml

@@ -38,8 +38,13 @@ tap:
     cpu: "1"
     memory: 4Gi
   snapshots:
-    storageClass: ""
+    local:
-    storageSize: 20Gi
+      storageClass: ""
+      storageSize: 20Gi
+    cloud:
+      provider: ""      # cloud storage provider: "s3" (empty = disabled)
+      configMaps: []    # names of ConfigMaps with cloud storage env vars
+      secrets: []       # names of Secrets with cloud storage credentials
   release:
     repo: https://helm.kubeshark.com
     name: kubeshark