Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added default fedramp endpoint for FedRamp scenarios #435

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added default fedramp endpoint for FedRamp scenarios #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion wiz-admission-controller/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ Clean the list of deployments for the auto-update flag, removing quotes and brac
optional: false
{{- end }}
- name: WIZ_ENV
value: {{ coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote }}
value: {{ include "wiz-admission-controller.clientEndpoint" . }}
{{- if or .Values.global.httpProxyConfiguration.enabled .Values.httpProxyConfiguration.enabled }}
- name: HTTP_PROXY
valueFrom:
Expand Down Expand Up @@ -414,3 +414,12 @@ publicregistryfedrampwizio.azurecr.us/wiz-app/wiz-admission-controller-fips:{{ .
{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ coalesce .Values.global.image.repository .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
{{- end -}}
{{- end -}}

{{- define "wiz-admission-controller.clientEndpoint" -}}
{{- $clientEndpoint := coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote -}}
{{- if and (empty $clientEndpoint) .Values.global.isFedRamp -}}
"fedramp"
{{- else -}}
{{ $clientEndpoint }}
{{- end -}}
{{- end -}}
9 changes: 9 additions & 0 deletions wiz-broker/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,12 @@ publicregistryfedrampwizio.azurecr.us/wiz-app/wiz-broker-fips:{{ .Values.image.t
{{ 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 }}
{{- end -}}
{{- end -}}

{{- define "wiz-broker.clientEndpoint" -}}
{{- $clientEndpoint := coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote -}}
{{- if and (empty $clientEndpoint) .Values.global.isFedRamp -}}
"fedramp"
{{- else -}}
{{ $clientEndpoint }}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion wiz-broker/templates/wiz-broker-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
value: {{ .Values.global.logLevel }}
{{- end }}
- name: WIZ_ENV
value: {{ coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote }}
value: {{ include "wiz-broker.clientEndpoint" . }}
{{- if not .Values.wizApiToken.usePodCustomEnvironmentVariablesFile }}
- name: WIZ_CLIENT_ID
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion wiz-kubernetes-connector/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 3.2.1
version: 3.2.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
9 changes: 9 additions & 0 deletions wiz-kubernetes-connector/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,3 +233,12 @@ publicregistryfedrampwizio.azurecr.us/wiz-app/wiz-broker-fips:{{ .Values.image.t
{{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ coalesce .Values.global.image.repository .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
{{- end -}}
{{- end -}}

{{- define "wiz-broker.clientEndpoint" -}}
{{- $clientEndpoint := coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote -}}
{{- if and (empty $clientEndpoint) .Values.global.isFedRamp -}}
"fedramp"
{{- else -}}
{{ $clientEndpoint }}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion wiz-kubernetes-connector/templates/job-create-connector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ spec:
optional: false
{{- end }}
- name: WIZ_ENV
value: {{ coalesce .Values.global.wizApiToken.clientEndpoint .Values.wizApiToken.clientEndpoint | quote }}
value: {{ include "wiz-broker.clientEndpoint" . }}
{{- if (or .Values.global.httpProxyConfiguration.enabled .Values.httpProxyConfiguration.enabled) }}
- name: HTTP_PROXY
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion wiz-kubernetes-connector/templates/job-delete-connector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ spec:
optional: false
{{- end }}
- name: WIZ_ENV
value: {{ .Values.wizApiToken.clientEndpoint | quote }}
value: {{ include "wiz-broker.clientEndpoint" . }}
{{- if (or .Values.global.httpProxyConfiguration.enabled .Values.httpProxyConfiguration.enabled) }}
- name: HTTP_PROXY
valueFrom:
Expand Down