Skip to content

Commit 264afd8

Browse files
committed
Update charts with latest changes
1 parent 9440c67 commit 264afd8

File tree

8 files changed

+34
-12
lines changed

8 files changed

+34
-12
lines changed

wiz-admission-controller/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ type: application
55
# This is the chart version. This version number should be incremented each time you make changes
66
# to the chart and its templates, including the app version.
77
# Versions are expected to follow Semantic Versioning (https://semver.org/)
8-
version: 3.10.0-preview.1
8+
version: 3.10.0-preview.2
99
# This is the version number of the application being deployed. This version number should be
1010
# incremented each time you make changes to the application. Versions are not expected to
1111
# follow Semantic Versioning. They should reflect the version the application is using.
1212
# It is recommended to use it with quotes.
1313
appVersion: "2.9"
1414
dependencies:
1515
- name: wiz-common
16-
version: "0.1.7"
16+
version: "0.1.8"
1717
repository: https://wiz-sec.github.io/charts
1818
# repository: "file://../wiz-common" # Use this line to test the chart locally

wiz-admission-controller/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,10 @@ false
394394
{{- end }}
395395
{{- if or .Values.global.httpProxyConfiguration.enabled .Values.httpProxyConfiguration.enabled }}
396396
{{ include "wiz-common.proxy.env" . | trim }}
397+
{{- if or .Values.global.httpProxyConfiguration.clientCertificate .Values.httpProxyConfiguration.clientCertificate }}
398+
- name: WIZ_HTTP_PROXY_CLIENT_CERT_PATH
399+
value: "{{ include "wiz-common.proxy.dir" . }}/clientCertificate"
400+
{{- end }}
397401
{{- end }}
398402
- name: WIZ_ENV
399403
value: {{ coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote }}

wiz-admission-controller/templates/proxy.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
{{- if .Values.httpProxyConfiguration.enabled }}
66
{{- if .Values.httpProxyConfiguration.create }}
77
{{- if hasPrefix "https://" .Values.httpProxyConfiguration.httpsProxy }}
8-
{{- fail "Error: httpsProxy must start with 'http://', https or any other protocol is not supported." }}
8+
{{- if empty .Values.httpProxyConfiguration.clientCertificate }}
9+
{{- fail "Error: HTTPS proxy requires a client certificate. Please provide clientCertificate in httpProxyConfiguration." }}
10+
{{- end }}
11+
{{- else }}
12+
{{- if not (empty .Values.httpProxyConfiguration.clientCertificate) }}
13+
{{- fail "Error: Client certificate is only supported for HTTPS proxies. Please remove clientCertificate or use an HTTPS proxy." }}
14+
{{- end }}
915
{{- end }}
1016

1117
apiVersion: v1
@@ -24,5 +30,6 @@ stringData:
2430
httpProxy: {{ .Values.httpProxyConfiguration.httpProxy | quote }}
2531
httpsProxy: {{ .Values.httpProxyConfiguration.httpsProxy | quote }}
2632
noProxyAddress: {{ .Values.httpProxyConfiguration.noProxyAddress | quote }}
33+
clientCertificate: {{ .Values.httpProxyConfiguration.clientCertificate | quote }}
2734
{{- end }}
2835
{{- end }}

wiz-admission-controller/values.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ httpProxyConfiguration:
6060
httpProxy: "" # URL to use as a proxy for outbound HTTP traffic.
6161
httpsProxy: "" # URL to use as a proxy for outbound HTTPS traffic.
6262
noProxyAddress: "kubernetes,kubernetes.default,kubernetes.default.svc,kubernetes.default.svc.cluster.local"
63+
# Proxy client certificate in PEM format. This is required for client certificate authentication.
64+
# The file should contain a certificate and a private key in PEM format.
65+
clientCertificate: ""
6366

6467
# When Horizontal Pod Autoscaling (`hpa.enabled`) is enabled (`true`),
6568
# this field is discarded and set to an empty value.
@@ -549,6 +552,9 @@ global:
549552
httpProxy: ""
550553
httpsProxy: ""
551554
noProxyAddress: "kubernetes,kubernetes.default,kubernetes.default.svc,kubernetes.default.svc.cluster.local"
555+
# Proxy client certificate in PEM format. This is required for client certificate authentication.
556+
# The file should contain a certificate and a private key in PEM format.
557+
clientCertificate: ""
552558

553559
image:
554560
registry: "" # Registry to get the container images from.

wiz-broker/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ apiVersion: v2
22
name: "wiz-broker"
33
description: Wiz Broker for tunneling http traffic to Wiz backend
44
type: application
5-
version: 2.3.8
5+
version: 2.3.9
66
appVersion: "2.7"
77
dependencies:
88
- name: wiz-common
9-
version: "0.1.7"
9+
version: "0.1.8"
1010
repository: https://wiz-sec.github.io/charts
1111
# repository: "file://../wiz-common" # Use this line to test the chart locally

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.7
5+
version: 0.1.8

wiz-common/templates/_proxy.tpl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
proxy
33
{{- end -}}
44

5+
{{- define "wiz-common.proxy.dir" -}}
6+
/var/{{ include "wiz-common.proxy.name" . }}
7+
{{- end -}}
58

69
{{- define "wiz-common.proxy.volume" -}}
710
{{- $secret := index . 0 -}}
@@ -15,15 +18,17 @@ proxy
1518
path: httpsProxy
1619
- key: noProxyAddress
1720
path: noProxy
21+
- key: clientCertificate
22+
path: clientCertificate
1823
{{- end -}}
1924

2025
{{- define "wiz-common.proxy.volumeMount" -}}
2126
- name: {{ include "wiz-common.proxy.name" . }}
22-
mountPath: /var/{{ include "wiz-common.proxy.name" . }}
27+
mountPath: {{ include "wiz-common.proxy.dir" . }}
2328
readOnly: true
2429
{{- end -}}
2530

2631
{{- define "wiz-common.proxy.env" -}}
2732
- name: CLI_FILES_AS_ENV_VARS
28-
value: "/var/{{ include "wiz-common.proxy.name" . }}/httpProxy,/var/{{ include "wiz-common.proxy.name" . }}/httpsProxy,/var/{{ include "wiz-common.proxy.name" . }}/noProxy"
29-
{{- end -}}
33+
value: "{{ include "wiz-common.proxy.dir" . }}/httpProxy,{{ include "wiz-common.proxy.dir" . }}/httpsProxy,{{ include "wiz-common.proxy.dir" . }}/noProxy"
34+
{{- end -}}

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.11
18+
version: 3.3.12
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.8"
30+
version: "2.3.9"
3131
condition: wiz-broker.enabled
3232
- name: wiz-common
33-
version: "0.1.7"
33+
version: "0.1.8"
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)