Skip to content

Commit 57abb29

Browse files
authored
Update charts with latest changes (#647)
1 parent 4e37e82 commit 57abb29

File tree

6 files changed

+52
-15
lines changed

6 files changed

+52
-15
lines changed

wiz-kubernetes-integration/Chart.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ apiVersion: v2
22
name: wiz-kubernetes-integration
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 0.2.101
5+
version: 0.2.102
66
appVersion: ""
7-
# Dependencies for wiz-kubernetes connector and wiz-admission-controller and wiz-sensor
7+
8+
# Dependencies for wiz-kubernetes connector and wiz-admission-controller and wiz-sensor
89
dependencies:
910
- name: wiz-kubernetes-connector
1011
repository: https://wiz-sec.github.io/charts
@@ -16,5 +17,5 @@ dependencies:
1617
condition: wiz-admission-controller.enabled
1718
- name: wiz-sensor
1819
repository: https://wiz-sec.github.io/charts
19-
version: ">=1.0.6816"
20+
version: ">=1.0.7326"
2021
condition: wiz-sensor.enabled

wiz-sensor/Chart.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ name: wiz-sensor
33
description: Wiz Sensor helm chart
44
type: application
55
home: https://www.wiz.io/
6-
version: 1.0.6816
7-
appVersion: 1.0.6816
6+
version: 1.0.7326
7+
appVersion: 1.0.7326
8+
annotations:
9+
diskScanAppVersion: 1.1.20

wiz-sensor/templates/_helpers.tpl

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,26 @@ Create chart name and version as used by the chart label.
3232
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
3333
{{- end }}
3434

35+
{{/*
36+
Sensor image tag
37+
*/}}
38+
{{- define "wiz-sensor.imageTag" -}}
39+
{{- coalesce .Values.image.tag .Chart.AppVersion }}
40+
{{- end }}
41+
42+
{{/*
43+
Disk scanner image tag
44+
*/}}
45+
{{- define "wiz-sensor.diskScanTag" -}}
46+
{{- coalesce .Values.image.diskScanTag .Chart.Annotations.diskScanAppVersion }}
47+
{{- end }}
48+
3549
{{/*
3650
Common labels
3751
*/}}
3852
{{- define "wiz-sensor.labels" -}}
39-
{{- $imageparts:= split "@" .Values.image.tag }}
40-
{{- $dsimageparts:= split "@" .Values.image.diskScanTag }}
53+
{{- $imageparts:= split "@" (include "wiz-sensor.imageTag" .) }}
54+
{{- $dsimageparts:= split "@" (include "wiz-sensor.diskScanTag" .) }}
4155
helm.sh/chart: {{ include "wiz-sensor.chart" . }}
4256
image/tag: {{ $imageparts._0 }}
4357
dsimage/tag: {{ $dsimageparts._0 }}

wiz-sensor/templates/daemonset.yaml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ spec:
8181
{{- if .Values.image.sha256 }}
8282
image: {{ printf "%s/%s@sha256:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.repository .Values.image.sha256 }}
8383
{{- else }}
84-
image: {{ printf "%s/%s:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.repository .Values.image.tag }}
84+
image: {{ printf "%s/%s:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.repository (include "wiz-sensor.imageTag" .) }}
8585
{{- end }}
8686
{{- else }}
87-
image: {{ printf "%s:%s" .Values.image.repository .Values.image.tag }}
87+
image: {{ printf "%s:%s" .Values.image.repository (include "wiz-sensor.imageTag" .) }}
8888
{{- end }}
8989
imagePullPolicy: {{ coalesce .Values.global.image.pullPolicy .Values.image.pullPolicy }}
9090
{{- with .Values.image.args }}
@@ -306,6 +306,10 @@ spec:
306306
- name: ENABLE_API_SECURITY
307307
value: "true"
308308
{{- end}}
309+
{{- if .Values.forensics.enabled }}
310+
- name: ENABLE_FORENSICS
311+
value: "true"
312+
{{- end}}
309313
{{- if .Values.openshift }}
310314
- name: OPENSHIFT
311315
value: "true"
@@ -324,6 +328,12 @@ spec:
324328
- name: FIXED_DEFS_VERSION
325329
value: {{ .Values.fixedDefsVersion }}
326330
{{- end }}
331+
{{- if not .Values.gkeAutopilot }}
332+
- name: HELM_CHART_VERSION
333+
value: {{ .Chart.Version }}
334+
- name: ALLOW_KUBELET_COMMUNICATION
335+
value: {{ .Values.allowKubeletCommunication | quote }}
336+
{{- end }}
327337

328338
volumeMounts:
329339
{{- with .Values.customVolumeMounts }}
@@ -381,9 +391,9 @@ spec:
381391
{{- if .Values.diskScan.enabled }}
382392
- name: wiz-disk-scanner
383393
{{- if (coalesce .Values.global.image.registry .Values.image.registry) }}
384-
image: {{ printf "%s/%s:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.diskScanRepository .Values.image.diskScanTag }}
394+
image: {{ printf "%s/%s:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.diskScanRepository (include "wiz-sensor.diskScanTag" .) }}
385395
{{- else }}
386-
image: {{ printf "%s:%s" .Values.image.diskScanRepository .Values.image.diskScanTag }}
396+
image: {{ printf "%s:%s" .Values.image.diskScanRepository (include "wiz-sensor.diskScanTag" .) }}
387397
{{- end }}
388398
imagePullPolicy: {{ .Values.image.diskScanPullPolicy }}
389399
{{- with .Values.image.diskScanArgs }}

wiz-sensor/templates/gkeallowlistsynchronizer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.gkeAutopilotUseAllowlist }}
1+
{{- if and .Values.gkeAutopilotUseAllowlist .Values.gkeAutopilotUseAllowlistSynchronizer }}
22
apiVersion: auto.gke.io/v1
33
kind: AllowlistSynchronizer
44
metadata:

wiz-sensor/values.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ diskScan:
3131
apiSecurity:
3232
enabled: false
3333

34+
# Sensor-based forensics (in private preview)
35+
forensics:
36+
enabled: false
37+
3438
# Expose some metrics to be consumed by Prometheus and other Metrics servers.
3539
# The default port can be changed in case of conflicts
3640
exposeMetrics: false
@@ -45,7 +49,8 @@ openshift: false
4549
gkeAutopilot: false
4650
# Newer GKE autopilot clusters support the use of an allowlist. This is required for some options in the chart
4751
gkeAutopilotUseAllowlist: false
48-
gkeAutopilotAllowlist: wiz-sensor-v2
52+
gkeAutopilotAllowlist: wiz-sensor-v4
53+
gkeAutopilotUseAllowlistSynchronizer: true
4954

5055
# use a custom SELinux type that is required by flatcar Linux nodes, but is incompatible with some
5156
# other node types (like AWS bottlerocket)
@@ -104,6 +109,11 @@ subscriptionTags: {} # Optional. List of key: value tags to be added to Subscrip
104109
# Format: major.minor.patch
105110
fixedDefsVersion: ""
106111

112+
# The sensor will attempt to communicate with local kubelet instead of api-server for pod information.
113+
# Note that if kubelet communication fails we will still query api-server for pod information.
114+
# Non-pod information, like controllers and namespaces are always queried directly from api-server.
115+
allowKubeletCommunication: false
116+
107117
# enable liveness probe for the sensor container
108118
livenessProbe:
109119
enabled: false
@@ -246,15 +256,15 @@ image:
246256
registry: wizio.azurecr.io
247257
repository: sensor
248258
args: {}
249-
tag: "v1"
259+
tag: "v1" # if not set, the chart's appVersion will be used
250260
# The sha256 of the image to use. Should not be used normally. Exists for compatibility with GKE Autopilot
251261
# with private registries. This overrides the tag variable when set.
252262
sha256: ""
253263
pullPolicy: Always
254264
# the default is "wizio.azurecr.io/wiz-app/wiz-workload-scanner:v1"
255265
diskScanRepository: wiz-app/wiz-workload-scanner
256266
diskScanArgs: {}
257-
diskScanTag: "v1"
267+
diskScanTag: "v1" # if not set, the chart's diskScanAppVersion will be used
258268
diskScanPullPolicy: Always
259269

260270
daemonset:

0 commit comments

Comments
 (0)