Skip to content

Commit 08ebff3

Browse files
committed
CircleCI: Upload wiz-sensor chart
1 parent ab23661 commit 08ebff3

File tree

6 files changed

+33
-6
lines changed

6 files changed

+33
-6
lines changed

wiz-kubernetes-integration/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ dependencies:
1717
condition: wiz-admission-controller.enabled
1818
- name: wiz-sensor
1919
repository: https://wiz-sec.github.io/charts
20-
version: ">=1.0.5835"
20+
version: ">=1.0.6051"
2121
condition: wiz-sensor.enabled

wiz-sensor/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ description: Wiz Sensor helm chart
33
home: https://www.wiz.io/
44
name: wiz-sensor
55
type: application
6-
version: 1.0.5835
6+
version: 1.0.6051
77
appVersion: 1.0.5835

wiz-sensor/templates/_helpers.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ Secrets
103103
TODO: Backward compatibility - remove
104104
*/}}
105105
{{- define "wiz-sensor.createSecret" -}}
106-
{{- if .Values.apikey -}}
106+
{{- if (or .Values.global.wizApiToken.wizApiTokensVolumeMount .Values.wizApiToken.wizApiTokensVolumeMount) }}
107+
false
108+
{{- else if .Values.apikey -}}
107109
{{- default true .Values.apikey.create -}}
108110
{{- else if (hasKey .Values.wizApiToken "createSecret") -}}
109111
{{- .Values.wizApiToken.createSecret -}}

wiz-sensor/templates/clusterrole.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ rules:
1313
resources: [
1414
"namespaces", "nodes", "daemonsets", "replicasets", "deployments",
1515
"jobs", "cronjobs", "statefulsets", "replicationcontrollers", "serviceaccounts",
16+
"nodes/proxy"
1617
]
1718
verbs: ["get", "list", "watch"]
1819
{{- end -}}

wiz-sensor/templates/daemonset.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,9 +327,11 @@ spec:
327327
mountPath: /wiz-sensor-store/
328328
- name: tmp-store
329329
mountPath: /tmp/
330+
{{- if not .Values.global.wizApiToken.wizApiTokensVolumeMount }}
330331
- name: api-client-secret
331332
mountPath: /api-client/
332-
{{- if not .Values.gkeAutopilot }}
333+
{{- end }}
334+
{{- if and (not .Values.gkeAutopilot) (not .Values.global.wizApiToken.wizApiTokensVolumeMount) }}
333335
- name: api-endpoint-name-secret
334336
mountPath: /api-endpoint-name/
335337
{{- end }}
@@ -499,10 +501,12 @@ spec:
499501
- name: host-mount
500502
mountPath: /host
501503
readOnly: true
504+
{{- if not .Values.global.wizApiToken.wizApiTokensVolumeMount }}
502505
- name: api-client-secret
503506
mountPath: /api-client/
504507
- name: api-endpoint-name-secret
505508
mountPath: /api-endpoint-name/
509+
{{- end }}
506510
- name: sensor-scanner-shared-vol
507511
mountPath: /wiz-sensor-share/
508512
- name: sensor-scanner-tmp-store
@@ -543,6 +547,7 @@ spec:
543547
path: {{ .Values.daemonset.sensorHostCacheFolder }}
544548
type: DirectoryOrCreate
545549
{{- end }}
550+
{{- if not .Values.global.wizApiToken.wizApiTokensVolumeMount }}
546551
- name: api-client-secret
547552
secret:
548553
secretName: {{ include "wiz-sensor.secretName" . }}
@@ -551,7 +556,8 @@ spec:
551556
path: clientId
552557
- key: clientToken
553558
path: clientToken
554-
{{- if not .Values.gkeAutopilot }}
559+
{{- end }}
560+
{{- if and (not .Values.gkeAutopilot) (not .Values.global.wizApiToken.wizApiTokensVolumeMount) }}
555561
- name: api-endpoint-name-secret
556562
secret:
557563
secretName: {{ include "wiz-sensor.secretName" . }}

wiz-sensor/values.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ livenessProbe:
100100

101101
# startup probe for the sensor container
102102
startupProbe:
103-
enabled: true
103+
enabled: false
104104
config:
105105
# delay before startup probe starts
106106
initialDelaySeconds: 15
@@ -141,6 +141,22 @@ wizApiToken:
141141
clientToken: ""
142142
clientEndpoint: "" # Set custom endpoint - should be "fedramp" for FEDRAMP environments
143143

144+
# Set the `wizApiTokensVolumeMount` below to a non-empty string if you are passing the Wiz service account
145+
# token (client id and client token) via mounts, e.g. when using the Vault operator to inject secrets to Pods.
146+
# In this case you are responsible for creating the mounts.
147+
# You must also set `.Values.customVolumes` and `.Values.customVolumeMounts`.
148+
# The mounts must have at least these 2 files:
149+
# clientId - with this content: <wiz service account id>
150+
# clientToken - with this content: <wiz service account token>
151+
#
152+
# e.g. wizApiTokensVolumeMount: "/var/api-client/"
153+
# and this is how the mount looks like on the file system:
154+
# /var/api-client/clientId
155+
# /var/api-client/clientToken
156+
#
157+
# Implies `secret.enabled: false`.
158+
wizApiTokensVolumeMount: ""
159+
144160
httpProxyConfiguration:
145161
# set to true to enable the use of a proxy. creates a secret with proxy configuration
146162
enabled: false
@@ -324,6 +340,8 @@ global:
324340
clientEndpoint: ""
325341
secret:
326342
name: ""
343+
wizApiTokensVolumeMount: ""
344+
327345

328346
httpProxyConfiguration:
329347
secretName: ""

0 commit comments

Comments
 (0)