Skip to content

Commit 134b1e3

Browse files
committed
Added default fedramp endpoint for FedRamp scenarios
1 parent 038f676 commit 134b1e3

File tree

7 files changed

+32
-5
lines changed

7 files changed

+32
-5
lines changed

wiz-admission-controller/templates/_helpers.tpl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ Clean the list of deployments for the auto-update flag, removing quotes and brac
348348
optional: false
349349
{{- end }}
350350
- name: WIZ_ENV
351-
value: {{ coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote }}
351+
value: {{ include "wiz-admission-controller.clientEndpoint" . }}
352352
{{- if or .Values.global.httpProxyConfiguration.enabled .Values.httpProxyConfiguration.enabled }}
353353
- name: HTTP_PROXY
354354
valueFrom:
@@ -414,3 +414,12 @@ publicregistryfedrampwizio.azurecr.us/wiz-app/wiz-admission-controller-fips:{{ .
414414
{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ coalesce .Values.global.image.repository .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
415415
{{- end -}}
416416
{{- end -}}
417+
418+
{{- define "wiz-admission-controller.clientEndpoint" -}}
419+
{{- $clientEndpoint := coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote -}}
420+
{{- if and (empty $clientEndpoint) .Values.global.isFedRamp -}}
421+
"fedramp"
422+
{{- else -}}
423+
{{ $clientEndpoint }}
424+
{{- end -}}
425+
{{- end -}}

wiz-broker/templates/_helpers.tpl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,12 @@ publicregistryfedrampwizio.azurecr.us/wiz-app/wiz-broker-fips:{{ .Values.image.t
111111
{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ coalesce .Values.global.image.repository .Values.image.repository }}:{{ coalesce .Values.global.image.tag .Values.image.tag | default .Chart.AppVersion }}
112112
{{- end -}}
113113
{{- end -}}
114+
115+
{{- define "wiz-broker.clientEndpoint" -}}
116+
{{- $clientEndpoint := coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote -}}
117+
{{- if and (empty $clientEndpoint) .Values.global.isFedRamp -}}
118+
"fedramp"
119+
{{- else -}}
120+
{{ $clientEndpoint }}
121+
{{- end -}}
122+
{{- end -}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ spec:
105105
value: {{ .Values.global.logLevel }}
106106
{{- end }}
107107
- name: WIZ_ENV
108-
value: {{ coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote }}
108+
value: {{ include "wiz-broker.clientEndpoint" . }}
109109
{{- if not .Values.wizApiToken.usePodCustomEnvironmentVariablesFile }}
110110
- name: WIZ_CLIENT_ID
111111
valueFrom:

wiz-kubernetes-connector/Chart.yaml

Lines changed: 1 addition & 1 deletion
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.2.1
18+
version: 3.2.2
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

wiz-kubernetes-connector/templates/_helpers.tpl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,3 +233,12 @@ publicregistryfedrampwizio.azurecr.us/wiz-app/wiz-broker-fips:{{ .Values.image.t
233233
{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ coalesce .Values.global.image.repository .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
234234
{{- end -}}
235235
{{- end -}}
236+
237+
{{- define "wiz-broker.clientEndpoint" -}}
238+
{{- $clientEndpoint := coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote -}}
239+
{{- if and (empty $clientEndpoint) .Values.global.isFedRamp -}}
240+
"fedramp"
241+
{{- else -}}
242+
{{ $clientEndpoint }}
243+
{{- end -}}
244+
{{- end -}}

wiz-kubernetes-connector/templates/job-create-connector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ spec:
115115
optional: false
116116
{{- end }}
117117
- name: WIZ_ENV
118-
value: {{ coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote }}
118+
value: {{ include "wiz-broker.clientEndpoint" . }}
119119
{{- if (or .Values.global.httpProxyConfiguration.enabled .Values.httpProxyConfiguration.enabled) }}
120120
- name: HTTP_PROXY
121121
valueFrom:

wiz-kubernetes-connector/templates/job-delete-connector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ spec:
100100
optional: false
101101
{{- end }}
102102
- name: WIZ_ENV
103-
value: {{ .Values.wizApiToken.clientEndpoint | quote }}
103+
value: {{ include "wiz-broker.clientEndpoint" . }}
104104
{{- if (or .Values.global.httpProxyConfiguration.enabled .Values.httpProxyConfiguration.enabled) }}
105105
- name: HTTP_PROXY
106106
valueFrom:

0 commit comments

Comments
 (0)