UNCLASSIFIED

Commit 09ce263b authored by bhearn's avatar bhearn
Browse files

Merge branch 'anchore-3.0.2' into 'main'

update chart from 1.12.4 to 1.12.7

See merge request !25
parents ef78f431 f859e650
Pipeline #200451 passed with stages
in 4 minutes and 41 seconds
...@@ -94,6 +94,8 @@ spec: ...@@ -94,6 +94,8 @@ spec:
{{- if not .Values.inject_secrets_via_env }} {{- if not .Values.inject_secrets_via_env }}
- secretRef: - secretRef:
name: {{ default (include "anchore-engine.fullname" .) .Values.anchoreGlobal.existingSecret }} name: {{ default (include "anchore-engine.fullname" .) .Values.anchoreGlobal.existingSecret }}
- secretRef:
name: {{ default (print (include "anchore-engine.fullname" .) "-admin-pass") .Values.anchoreGlobal.existingSecret }}
{{- end }} {{- end }}
- configMapRef: - configMapRef:
name: {{ template "anchore-engine.fullname" . }}-env name: {{ template "anchore-engine.fullname" . }}-env
......
...@@ -141,7 +141,7 @@ ingress: ...@@ -141,7 +141,7 @@ ingress:
# Global configuration shared by all anchore-engine services. # Global configuration shared by all anchore-engine services.
anchoreGlobal: anchoreGlobal:
# Image used for all anchore engine deployments (excluding enterprise components). # Image used for all anchore engine deployments (excluding enterprise components).
image: registry1.dso.mil/ironbank/anchore/engine/engine:0.9.2 image: registry1.dso.mil/ironbank/anchore/engine/engine:0.9.3
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
# Set image pull secret name if using an anchore-engine image from a private registry # Set image pull secret name if using an anchore-engine image from a private registry
...@@ -220,7 +220,7 @@ anchoreGlobal: ...@@ -220,7 +220,7 @@ anchoreGlobal:
metricsAuthDisabled: false metricsAuthDisabled: false
# Sets the password & email address for the default anchore-engine admin user. # Sets the password & email address for the default anchore-engine admin user.
defaultAdminPassword: foobar defaultAdminPassword:
defaultAdminEmail: example@email.com defaultAdminEmail: example@email.com
saml: saml:
...@@ -685,7 +685,7 @@ anchoreEnterpriseGlobal: ...@@ -685,7 +685,7 @@ anchoreEnterpriseGlobal:
# Create this secret with the following command - kubectl create secret generic anchore-enterprise-license --from-file=license.yaml=<PATH TO LICENSE.YAML> # Create this secret with the following command - kubectl create secret generic anchore-enterprise-license --from-file=license.yaml=<PATH TO LICENSE.YAML>
licenseSecretName: anchore-enterprise-license licenseSecretName: anchore-enterprise-license
image: registry1.dso.mil/ironbank/anchore/enterprise/enterprise:3.0.1 image: registry1.dso.mil/ironbank/anchore/enterprise/enterprise:3.0.2
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
# Name of the kubernetes secret containing your dockerhub creds with access to the anchore enterprise images. # Name of the kubernetes secret containing your dockerhub creds with access to the anchore enterprise images.
# Create this secret with the following command - kubectl create secret docker-registry anchore-dockerhub-creds --docker-server=docker.io --docker-username=<USERNAME> --docker-password=<PASSWORD> --docker-email=<EMAIL_ADDRESS> # Create this secret with the following command - kubectl create secret docker-registry anchore-dockerhub-creds --docker-server=docker.io --docker-username=<USERNAME> --docker-password=<PASSWORD> --docker-email=<EMAIL_ADDRESS>
......
registry1.dso.mil/ironbank/anchore/enterprise/enterprise:3.0.1 registry1.dso.mil/ironbank/anchore/enterprise/enterprise:3.0.2
registry1.dso.mil/ironbank/anchore/enterpriseui/enterpriseui:3.0.1 registry1.dso.mil/ironbank/anchore/enterpriseui/enterpriseui:3.0.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment