diff --git a/chart/templates/anchore/values.yaml b/chart/templates/anchore/values.yaml index 55bcd832cf6067c4e30dc5fa820ec64be258fd6a..bfca99c797ec444f06d309050fe702807b9e11c7 100644 --- a/chart/templates/anchore/values.yaml +++ b/chart/templates/anchore/values.yaml @@ -47,6 +47,10 @@ anchoreGlobal: defaultAdminPassword: {{ .Values.addons.anchore.adminPassword }} {{- end }} imagePullSecretName: private-registry + {{- if or (and (not (hasKey .Values.addons.anchore.values "anchoreGlobal.existingSecret")) (not (hasKey .Values.addons.anchore.values "anchoreGlobal.saml.useExistingSecret"))) (not (hasKey .Values.addons.anchore.values "anchoreGlobal.saml.secret")) }} + saml: + secret: "{{ b64enc (randAlphaNum 12) }}" + {{- end }} {{- if .Values.addons.anchore.enterprise.enabled }} anchore-feeds-db: @@ -66,12 +70,12 @@ anchore-ui-redis: {{- if and .Values.addons.anchore.redis.host .Values.addons.anchore.redis.port .Values.addons.anchore.redis.password }} enabled: false externalEndpoint: "redis://{{ .Values.addons.anchore.redis.username | default "nouser" }}:{{ .Values.addons.anchore.redis.password }}@{{ .Values.addons.anchore.redis.host }}:{{ .Values.addons.anchore.redis.port }}" - password: {{ .Values.addons.anchore.redis.password }} + auth: + password: {{ .Values.addons.anchore.redis.password }} {{- end }} image: pullSecrets: - private-registry {{- end }} -{{- end }} - +{{- end }} \ No newline at end of file diff --git a/chart/values.yaml b/chart/values.yaml index ecb2d6800163a26b338717e2e586a0873013b02b..2460bf738fdcf16d7ef9f482d735dcdf3afc47a7 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -714,7 +714,7 @@ addons: git: repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git path: "./chart" - tag: "1.12.15-bb.0" + tag: "1.12.16-bb.0" # -- Flux reconciliation overrides specifically for the Anchore Package flux: diff --git a/scripts/package/synker.yaml b/scripts/package/synker.yaml index a56a1733f1bff8987c03c36a0d758cd75d04282d..f877342f5e983d6ae248d46a8776e845dd913027 100644 --- a/scripts/package/synker.yaml +++ b/scripts/package/synker.yaml @@ -31,6 +31,7 @@ source: - registry1.dso.mil/ironbank/twistlock/defender/defender:20.12.531 - registry1.dso.mil/ironbank/anchore/enterprise/enterprise:3.0.3 - registry1.dso.mil/ironbank/anchore/enterpriseui/enterpriseui:3.0.3 + - registry1.dso.mil/ironbank/gitlab/gitlab/kubectl:13.9.0 # Images used by pipeline-templates # NOTE: These are __not__ fully inclusive yet, see this issue for updates: https://repo1.dso.mil/platform-one/big-bang/bigbang/-/issues/145 - registry.il2.dso.mil/platform-one/devops/pipeline-templates/pipeline-job/sonar-scanner-dotnet31:4.10 @@ -44,7 +45,7 @@ source: # gitlab-runner-helper image: This image does not get captured from the release deployment # the gitlab-runner-helper image only gets pulled when a pipeline runs. So it must be listed here - registry1.dso.mil/ironbank/gitlab/gitlab-runner/gitlab-runner-helper:v13.9.0 - # Explicily add Keycloak image because Keycloak is not enabled in pipelines so the imaeg does not get pulled + # Explicitly add Keycloak image because Keycloak is not enabled in pipelines so the image does not get pulled - registry.dso.mil/platform-one/big-bang/apps/security-tools/keycloak/keycloak-ib:13.0.0-1.0.3 # Don't include until fortify is supported #- registry.il2.dso.mil/platform-one/devops/pipeline-templates/pipeline-job/dotnet-fortify:20.2.0