Merge remote-tracking branch 'origin/main' into

700-update-nexus-to-3-33-1-01

# Conflicts:
#	CHANGELOG.md
#	chart/Chart.yaml

CHANGELOG.md

@@ -6,6 +6,9 @@
 - Sync with upstream charts 33.1.0 at https://github.com/sonatype/helm3-charts/tree/master/charts/nexus-repository-manager
 - Version bump to 3.33.1
 - Increased default cpu resource request and limits
+## [29.1.0-bb.9] - 2021-09-01
+### Changed
+- add map to specify image, tag, and policy in values for proxy and saml jobs
 
 ## [29.1.0-bb.8] - 2021-08-23
 ### Added

chart/templates/bigbang/proxy.yaml

@@ -18,7 +18,8 @@ spec:
         {{- toYaml . | nindent 8}}
       {{- end }}
       containers:
-      - image: registry1.dso.mil/ironbank/redhat/ubi/ubi8-minimal:latest
+      - image: "{{ .Values.job_image.repository }}:{{ .Values.job_image.tag }}"
+        imagePullPolicy: {{ .Values.job_image.pullPolicy }}
         name: proxy
         command:
           - sh

chart/templates/bigbang/saml.yaml

@@ -18,7 +18,8 @@ spec:
         {{- toYaml . | nindent 8}}
       {{- end }}
       containers:
-      - image: registry1.dso.mil/ironbank/redhat/ubi/ubi8-minimal:latest
+      - image: "{{ .Values.job_image.repository }}:{{ .Values.job_image.tag }}"
+        imagePullPolicy: {{ .Values.job_image.pullPolicy }}
         name: saml
         command:
           - sh

chart/values.yaml

@@ -72,6 +72,11 @@ proxy:
       httpsAuthNtlmDomain: ~
       nonProxyHosts: []
 
+job_image:
+  repository: registry1.dso.mil/ironbank/redhat/ubi/ubi8-minimal
+  tag: 8.4
+  pullPolicy: IfNotPresent
+
 # -- End of BigBang Additions
 
 ingress: