Removed the fed registries from the values.yaml

Author: ofirc-wiz

wiz-admission-controller/templates/_helpers.tpl

@@ -403,7 +403,7 @@ Clean the list of deployments for the auto-update flag, removing quotes and brac
 
 {{- define "wiz-admission-controller.image" -}}
 {{- if .Values.global.isFedRamp -}}
-{{ .Values.image.fedRegistry }}/{{ .Values.image.fedRepository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+publicregistryfedrampwizio.azurecr.us/wiz-app/wiz-admission-controller-fips:{{ .Values.image.tag | default .Chart.AppVersion }}
 {{- else -}}
 {{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ coalesce .Values.global.image.repository .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
 {{- end -}}

wiz-admission-controller/values.yaml

@@ -10,7 +10,8 @@ commonLabels: {} # Labels applied on all the resources (not used for selection)
 wizApiToken:
   clientId: "" # Client ID of the Wiz Service Account.
   clientToken: "" # Client secret of the Wiz Service Account.
-  clientEndpoint: "" # Set to 'gov' or 'fedramp' for gov/fedramp tenants only, otherwise leave blank.
+  clientEndpoint: "" # Defaults to commercial.
+                     # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
 
   secret:
     # Should a Secret be created by the chart or not.
@@ -53,9 +54,7 @@ podDisruptionBudget:
 
 image:
   registry: wiziopublic.azurecr.io/wiz-app
-  fedRegistry: publicregistryfedrampwizio.azurecr.us/wiz-app
   repository: wiz-admission-controller
-  fedRepository: wiz-admission-controller-fips
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -490,7 +489,8 @@ global:
   wizApiToken:
     clientId: "" 
     clientToken: ""
-    clientEndpoint: "" # Wiz endpoint to connect to (required for gov tenants).
+    clientEndpoint: "" # Defaults to commercial.
+                       # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
 
     secret:
       # The name of the Wiz Service Account Secret.

wiz-broker/templates/_helpers.tpl

@@ -106,7 +106,7 @@ Secrets names
 
 {{- define "wiz-broker.image" -}}
 {{- if .Values.global.isFedRamp -}}
-{{ .Values.image.fedRegistry }}/{{ .Values.image.fedRepository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+publicregistryfedrampwizio.azurecr.us/wiz-app/wiz-broker-fips:{{ .Values.image.tag | default .Chart.AppVersion }}
 {{- else -}}
 {{ 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 -}}

wiz-broker/values.yaml

@@ -9,9 +9,7 @@ commonLabels: {} # Labels applied on all the resources (not used for selection)
 
 image:
   registry: wiziopublic.azurecr.io/wiz-app
-  fedRegistry: publicregistryfedrampwizio.azurecr.us/wiz-app
   repository: wiz-broker
-  fedRepository: wiz-broker-fips
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -71,7 +69,8 @@ wizConnector:
 wizApiToken:
   clientId: "" # Client ID of the Wiz Service Account.
   clientToken: "" # Client secret of the Wiz Service Account.
-  clientEndpoint: "" # Set to 'gov' or 'fedramp' for gov/fedramp tenants only, otherwise leave blank.
+  clientEndpoint: "" # Defaults to commercial.
+                     # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
 
   secret:
     # Should a Secret be created by the chart or not.
@@ -116,9 +115,7 @@ global:
 
   image:
     registry: wiziopublic.azurecr.io/wiz-app
-    fedRegistry: publicregistryfedrampwizio.azurecr.us/wiz-app
     repository: wiz-broker
-    fedRepository: wiz-broker-fips
     pullPolicy: Always  # Always pull the image on every deployment
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
@@ -151,7 +148,8 @@ global:
     runAsUser: 1000
 
   wizApiToken:
-    clientEndpoint: "" # Wiz endpoint to connect to (required for gov tenants).
+    clientEndpoint: "" # Defaults to commercial.
+                       # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
     secret:
       name: "" # Override with parent secret name
 

wiz-kubernetes-connector/templates/_helpers.tpl

@@ -228,7 +228,7 @@ delete-kubernetes-connector
 
 {{- define "wiz-broker.image" -}}
 {{- if .Values.global.isFedRamp -}}
-{{ .Values.image.fedRegistry }}/{{ .Values.image.fedRepository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+publicregistryfedrampwizio.azurecr.us/wiz-app/wiz-broker-fips:{{ .Values.image.tag | default .Chart.AppVersion }}
 {{- else -}}
 {{ coalesce .Values.global.image.registry .Values.image.registry }}/{{ coalesce .Values.global.image.repository .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
 {{- end -}}

wiz-kubernetes-connector/values.yaml

@@ -7,10 +7,7 @@ commonLabels: {} # Labels applied on all the resources (not used for selection)
 
 image:
   registry: wiziopublic.azurecr.io/wiz-app
-  fedRegistry: publicregistryfedrampwizio.azurecr.us/wiz-app
-  # Use this if you are deploying on federal environments with FIPS endpoints.
   repository: wiz-broker
-  fedRepository: wiz-broker-fips
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -79,7 +76,8 @@ autoCreateConnector:
 wizApiToken:
   clientId: "" # Client ID of the Wiz Service Account.
   clientToken: "" # Client secret of the Wiz Service Account.
-  clientEndpoint: "" # Set to 'gov' or 'fedramp' for gov/fedramp tenants only, otherwise leave blank.
+  clientEndpoint: "" # Defaults to commercial.
+                     # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
 
   secret:
     # Should a Secret be created by the chart or not.
@@ -132,7 +130,8 @@ wiz-broker:
   customVolumeMounts: [] # Additional volume mounts to add to the components Pods
 
   wizApiToken:
-    clientEndpoint: "" # Wiz endpoint to connect to (required for gov tenants).
+    clientEndpoint: "" # Defaults to commercial.
+                       # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
     secret:
       create: false # Secret created by wiz-kubernetes-connector.
     secretName: ""
@@ -182,9 +181,7 @@ httpProxyConfiguration:
 global:
   image:
     registry: wiziopublic.azurecr.io/wiz-app
-    fedRegistry: publicregistryfedrampwizio.azurecr.us/wiz-app
     repository: wiz-broker
-    fedRepository: wiz-broker-fips
     pullPolicy: Always
     # Overrides the image tag whose default is the chart appVersion.
     tag: ""
@@ -237,7 +234,8 @@ global:
     allowPrivilegeEscalation: false
 
   wizApiToken:
-    clientEndpoint: "" # Wiz endpoint to connect to (required for gov tenants).
+    clientEndpoint: "" # Defaults to commercial.
+                       # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
     secret:
       name: "" # Override with parent secret name
 

wiz-kubernetes-integration/values.yaml

@@ -10,7 +10,8 @@ global:
   wizApiToken:
     clientId: "" # Client ID of the Wiz Service Account.
     clientToken: "" # Client secret of the Wiz Service Account.
-    clientEndpoint: "" # Set to 'gov' or 'fedramp' for gov/fedramp tenants only, otherwise leave blank.
+    clientEndpoint: "" # Defaults to commercial.
+                       # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
 
     secret:
       # Should a Secret be created by the chart or not.

wiz-sensor/templates/_helpers.tpl

@@ -149,7 +149,7 @@ log levels
 
 {{- define "wiz-sensor-disk-scanner.image" -}}
   {{- if .Values.global.isFedRamp -}}
-    {{ .Values.image.fedRegistry }}/{{ .Values.image.diskScanRepository }}:{{ .Values.image.diskScanTag }}
+    wizfedramp.azurecr.us/{{ .Values.image.diskScanRepository }}:{{ .Values.image.diskScanTag }}
   {{- else -}}
     {{- if (coalesce .Values.global.image.registry .Values.image.registry) -}}
       {{ printf "%s/%s:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.diskScanRepository .Values.image.diskScanTag }}
@@ -161,7 +161,7 @@ log levels
 
 {{- define "wiz-sensor.image" -}}
   {{- if .Values.global.isFedRamp -}}
-    {{ .Values.image.fedRegistry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
+    wizfedramp.azurecr.us/{{ .Values.image.repository }}:{{ .Values.image.tag }}
   {{- else -}}
     {{- if (coalesce .Values.global.image.registry .Values.image.registry) -}}
       {{ printf "%s/%s:%s" (coalesce .Values.global.image.registry .Values.image.registry) .Values.image.repository .Values.image.tag }}

wiz-sensor/values.yaml

@@ -90,7 +90,8 @@ wizApiToken:
   # The chart will refuse to install unless these are set to valid values
   clientId: ""
   clientToken: ""
-  clientEndpoint: "" # Set custom endpoint - should be "fedramp" for FEDRAMP environments
+  clientEndpoint: "" # Defaults to commercial. Leave blank for most cases.
+                     # If `global.isFedRamp` is `true`, this field gets automatically set to `fedramp`.
 
 httpProxyConfiguration:
   # set to true to enable the use of a proxy. creates a secret with proxy configuration
@@ -160,7 +161,6 @@ image:
   # "registry/repository:tag" and here this is "wizio.azurecr.io/sensor:v1".
   # For FEDRAMP use wizfedramp.azurecr.us, for a final URL of "wizfedramp.azurecr.us/sensor:v1".
   registry: wizio.azurecr.io
-  fedRegistry: wizfedramp.azurecr.us
   repository: sensor
   args: {}
   tag: "v1"