test fips enable and kubectl move to nirmata

nirmata · Jan 27, 2025 · ba2f91a · ba2f91a
1 parent 66d4591
commit ba2f91a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/charts/reports-server/templates/deployment.yaml b/charts/reports-server/templates/deployment.yaml
@@ -86,6 +86,15 @@ spec:
           volumeMounts:
             - mountPath: /tmp
               name: tmp-dir
+          {{- $tag := default .Values.image.tag .Chart.AppVersion -}}
+          {{- $imageRegistry := default .Values.image.registry "" -}}
+          {{- $repository := required "An image repository is required" .Values.image.repository -}}
+          {{- $fipsEnabled := .Values.fipsEnabled | default false -}}
+          {{- if $fipsEnabled -}}
+            {{ $imageRegistry }}/{{ $repository }}-fips:{{ $tag }}
+          {{- else -}}
+            {{ $imageRegistry }}/{{ $repository }}:{{ $tag }}
+          {{- end -}}
           image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:

diff --git a/charts/reports-server/values.yaml b/charts/reports-server/values.yaml
@@ -2,7 +2,7 @@
 # @ignored
 templating:
   enabled: false
-
+fipsEnabled: false
 cloudnative-pg:
   crds:
     create: false
@@ -224,12 +224,13 @@ apiServicesManagement:
 
   image:
     # -- (string) Image registry
-    registry: docker.io
+    registry: ~
     # -- Image repository
-    repository: bitnami/kubectl
+    repository: reg.nirmata.io/nirmata/kubectl
+
     # -- Image tag
     # Defaults to `latest` if omitted
-    tag: '1.30.2'
+    tag: '1.32.1'
     # -- (string) Image pull policy
     # Defaults to image.pullPolicy if omitted
     pullPolicy: ~