Skip to content

Commit b49365e

Browse files
circleci-wizcircleci-wiz
committed
Update charts with latest changes
1 parent d2b37e2 commit b49365e

File tree

12 files changed

+96
-31
lines changed

12 files changed

+96
-31
lines changed

‎wiz-admission-controller/Chart.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,18 @@
11
apiVersion: v2
22
name: wiz-admission-controller
33
description: Wiz admission controller
4-
54
type: application
6-
75
# This is the chart version. This version number should be incremented each time you make changes
86
# to the chart and its templates, including the app version.
97
# Versions are expected to follow Semantic Versioning (https://semver.org/)
10-
version: 3.9.1
11-
8+
version: 3.9.2
129
# This is the version number of the application being deployed. This version number should be
1310
# incremented each time you make changes to the application. Versions are not expected to
1411
# follow Semantic Versioning. They should reflect the version the application is using.
1512
# It is recommended to use it with quotes.
1613
appVersion: "2.8"
17-
1814
dependencies:
1915
- name: wiz-common
20-
version: "0.1.6"
16+
version: "0.1.7"
2117
repository: https://wiz-sec.github.io/charts
2218
# repository: "file://../wiz-common" # Use this line to test the chart locally

‎wiz-admission-controller/templates/_helpers.tpl‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -319,15 +319,24 @@ Clean the list of deployments for the auto-update flag, removing quotes and brac
319319
{{- end -}}
320320

321321
{{- define "wiz-admission-controller.isWizApiTokenSecretEnabled" -}}
322-
{{- if and (.Values.wizApiToken.secret.create) (eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true") }}
322+
{{- if and (.Values.wizApiToken.secret.create) (eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount .Values.global.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true") }}
323323
true
324324
{{- else }}
325325
false
326326
{{- end }}
327327
{{- end }}
328328

329+
{{- define "wiz-admission-controller.isWizApiClientVolumeMountEnabled" -}}
330+
{{- if eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount .Values.global.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true" -}}
331+
true
332+
{{- else -}}
333+
false
334+
{{- end }}
335+
{{- end }}
336+
337+
329338
{{- define "wiz-admission-controller.spec.common.volumeMounts" -}}
330-
{{- if eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true" -}}
339+
{{- if eq (include "wiz-admission-controller.isWizApiClientVolumeMountEnabled" . | trim | lower) "true" }}
331340
- name: {{ include "wiz-common.volumes.apiClientName" . }}
332341
mountPath: /var/{{ include "wiz-common.volumes.apiClientName" . }}
333342
readOnly: true
@@ -338,7 +347,7 @@ Clean the list of deployments for the auto-update flag, removing quotes and brac
338347
{{- end -}}
339348

340349
{{- define "wiz-admission-controller.spec.common.volumes" -}}
341-
{{- if eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true" -}}
350+
{{- if eq (include "wiz-admission-controller.isWizApiClientVolumeMountEnabled" . | trim | lower) "true" }}
342351
- name: {{ include "wiz-common.volumes.apiClientName" . | trim }}
343352
secret:
344353
secretName: {{ include "wiz-admission-controller.secretApiTokenName" . | trim }}
@@ -353,8 +362,8 @@ Clean the list of deployments for the auto-update flag, removing quotes and brac
353362
{{- if not .Values.wizApiToken.usePodCustomEnvironmentVariablesFile }}
354363
- name: CLI_FILES_AS_ARGS
355364
{{- $wizApiTokensPath := "" -}}
356-
{{- if .Values.wizApiToken.wizApiTokensVolumeMount }}
357-
{{- $wizApiTokensPath = .Values.wizApiToken.wizApiTokensVolumeMount -}}
365+
{{- if coalesce .Values.wizApiToken.wizApiTokensVolumeMount .Values.global.wizApiToken.wizApiTokensVolumeMount }}
366+
{{- $wizApiTokensPath = coalesce .Values.wizApiToken.wizApiTokensVolumeMount .Values.global.wizApiToken.wizApiTokensVolumeMount -}}
358367
{{- else }}
359368
{{- $wizApiTokensPath = printf "/var/%s" (include "wiz-common.volumes.apiClientName" .) -}}
360369
{{- end }}

‎wiz-admission-controller/values.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,21 @@ global:
510510
secret:
511511
# The name of the Wiz Service Account Secret.
512512
name: ""
513+
# Set the `wizApiTokensVolumeMount` below to a non-empty string if you are passing the Wiz service account
514+
# token (client id and client token) via mounts, e.g. when using the Vault operator to inject secrets to Pods.
515+
# In this case you are responsible for creating the mounts.
516+
# You must also set `.Values.customVolumes` and `.Values.customVolumeMounts`.
517+
# The mounts must have at least these 2 files:
518+
# clientId - with this content: <wiz service account id>
519+
# clientToken - with this content: <wiz service account token>
520+
#
521+
# e.g. wizApiTokensVolumeMount: "/var/api-client/"
522+
# and this is how the mount looks like on the file system:
523+
# /var/api-client/clientId
524+
# /var/api-client/clientToken
525+
#
526+
# Implies `secret.enabled: false`.
527+
wizApiTokensVolumeMount: ""
513528

514529
# Redirect HTTP and/or HTTPS traffic through a proxy.
515530
httpProxyConfiguration:

‎wiz-broker/Chart.yaml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
apiVersion: v2
22
name: "wiz-broker"
33
description: Wiz Broker for tunneling http traffic to Wiz backend
4-
54
type: application
6-
7-
version: 2.3.7
5+
version: 2.3.8
86
appVersion: "2.7"
9-
107
dependencies:
118
- name: wiz-common
12-
version: "0.1.6"
9+
version: "0.1.7"
1310
repository: https://wiz-sec.github.io/charts
1411
# repository: "file://../wiz-common" # Use this line to test the chart locally

‎wiz-broker/templates/_helpers.tpl‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,24 @@ Secrets names
109109
{{- end -}}
110110

111111
{{- define "wiz-broker.isWizApiTokenSecretEnabled" -}}
112-
{{- if and (.Values.wizApiToken.secret.create) (eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true") }}
112+
{{- if and (.Values.wizApiToken.secret.create) (eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount .Values.global.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true") }}
113113
true
114114
{{- else }}
115115
false
116116
{{- end }}
117117
{{- end }}
118118

119+
{{- define "wiz-broker.isWizApiClientVolumeMountEnabled" -}}
120+
{{- if eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount .Values.global.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true" -}}
121+
true
122+
{{- else -}}
123+
false
124+
{{- end }}
125+
{{- end }}
126+
127+
119128
{{- define "wiz-broker.spec.common.volumeMounts" -}}
120-
{{- if eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true" -}}
129+
{{- if eq (include "wiz-broker.isWizApiClientVolumeMountEnabled" . | trim | lower) "true" }}
121130
- name: {{ include "wiz-common.volumes.apiClientName" . }}
122131
mountPath: /var/{{ include "wiz-common.volumes.apiClientName" . }}
123132
readOnly: true
@@ -128,7 +137,7 @@ Secrets names
128137
{{- end -}}
129138

130139
{{- define "wiz-broker.spec.common.volumes" -}}
131-
{{- if eq (include "wiz-common.isWizApiClientVolumeMountEnabled" (list .Values.wizApiToken.usePodCustomEnvironmentVariablesFile .Values.wizApiToken.wizApiTokensVolumeMount) | trim | lower) "true" -}}
140+
{{- if eq (include "wiz-broker.isWizApiClientVolumeMountEnabled" . | trim | lower) "true" }}
132141
- name: {{ include "wiz-common.volumes.apiClientName" . | trim }}
133142
secret:
134143
secretName: {{ include "wiz-broker.apiTokenSecretName" . | trim }}

‎wiz-broker/templates/wiz-broker-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ spec:
127127
{{- if not .Values.wizApiToken.usePodCustomEnvironmentVariablesFile }}
128128
- name: CLI_FILES_AS_ARGS
129129
{{- $wizApiTokensPath := "" -}}
130-
{{- if .Values.wizApiToken.wizApiTokensVolumeMount }}
131-
{{- $wizApiTokensPath = .Values.wizApiToken.wizApiTokensVolumeMount -}}
130+
{{- if coalesce .Values.global.wizApiToken.wizApiTokensVolumeMount .Values.wizApiToken.wizApiTokensVolumeMount }}
131+
{{- $wizApiTokensPath = coalesce .Values.global.wizApiToken.wizApiTokensVolumeMount .Values.wizApiToken.wizApiTokensVolumeMount -}}
132132
{{- else }}
133133
{{- $wizApiTokensPath = printf "/var/%s" (include "wiz-common.volumes.apiClientName" .) -}}
134134
{{- end }}

‎wiz-broker/values.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,21 @@ global:
196196
clientEndpoint: "" # Defaults to commercial.
197197
secret:
198198
name: "" # Override with parent secret name
199+
# Set the `wizApiTokensVolumeMount` below to a non-empty string if you are passing the Wiz service account
200+
# token (client id and client token) via mounts, e.g. when using the Vault operator to inject secrets to Pods.
201+
# In this case you are responsible for creating the mounts.
202+
# You must also set `.Values.customVolumes` and `.Values.customVolumeMounts`.
203+
# The mounts must have at least these 2 files:
204+
# clientId - with this content: <wiz service account id>
205+
# clientToken - with this content: <wiz service account token>
206+
#
207+
# e.g. wizApiTokensVolumeMount: "/var/api-client/"
208+
# and this is how the mount looks like on the file system:
209+
# /var/api-client/clientId
210+
# /var/api-client/clientToken
211+
#
212+
# Implies `secret.enabled: false`.
213+
wizApiTokensVolumeMount: ""
199214

200215
httpProxyConfiguration:
201216
enabled: false # Should the components use a proxy.

‎wiz-common/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v2
22
name: wiz-common
33
description: Common library chart for shared templates
44
type: library
5-
version: 0.1.6
5+
version: 0.1.7

‎wiz-common/templates/_wizApiClientVolumeMounts.tpl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ api-client
55
{{- define "wiz-common.isWizApiClientVolumeMountEnabled" -}}
66
{{- $usePodCustomEnvironmentVariablesFile := index . 0 -}}
77
{{- $wizApiTokensVolumeMount := index . 1 -}}
8-
{{- if or $usePodCustomEnvironmentVariablesFile $wizApiTokensVolumeMount }}
8+
{{- $globalWizApiTokensVolumeMount := index . 2 -}}
9+
{{- if or $usePodCustomEnvironmentVariablesFile (coalesce $wizApiTokensVolumeMount $globalWizApiTokensVolumeMount "") }}
910
false
1011
{{- else }}
1112
true

‎wiz-kubernetes-connector/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 3.3.10
18+
version: 3.3.11
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
@@ -27,9 +27,9 @@ dependencies:
2727
- name: wiz-broker
2828
repository: https://wiz-sec.github.io/charts
2929
# repository: "file://../wiz-broker" # Use this line to test the chart locally
30-
version: "2.3.7"
30+
version: "2.3.8"
3131
condition: wiz-broker.enabled
3232
- name: wiz-common
33-
version: "0.1.6"
33+
version: "0.1.7"
3434
repository: https://wiz-sec.github.io/charts
3535
# repository: "file://../wiz-common" # Use this line to test the chart locally

0 commit comments

Comments
 (0)