[stable/anchore-engine] Engine Release v0.4.1 (#15195)

* remove unnecessary quotes from templates

Signed-off-by: Brady Todhunter <bradyt@anchore.com>

* update ui to v0.3.4 & add policy hub config. Update engine & enterprise to v0.4.1

Signed-off-by: Brady Todhunter <bradyt@anchore.com>

* update Chart & app version

Signed-off-by: Brady Todhunter <bradyt@anchore.com>
This commit is contained in:
Brady Todhunter
2019-07-01 20:51:08 -07:00
committed by Kubernetes Prow Robot
parent 43cd1ac61d
commit 595f51dda8
15 changed files with 43 additions and 31 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: anchore-engine
version: 1.1.1
appVersion: 0.4.0
version: 1.2.0
appVersion: 0.4.1
description: Anchore container analysis and policy evaluation engine service
keywords:
- analysis
@@ -5,7 +5,7 @@ metadata:
name: {{ template "anchore-engine.analyzer.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
@@ -6,7 +6,7 @@ metadata:
labels:
app: {{ template "anchore-engine.fullname" . }}
component: {{ $component }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.anchoreApi.labels }}
@@ -5,7 +5,7 @@ metadata:
name: {{ template "anchore-engine.catalog.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
@@ -139,7 +139,7 @@ metadata:
name: {{ template "anchore-engine.catalog.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
@@ -4,7 +4,7 @@ metadata:
name: {{ template "anchore-engine.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.anchoreGlobal.labels }}
@@ -6,7 +6,7 @@ metadata:
name: {{ template "anchore-engine.enterprise.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
@@ -6,7 +6,7 @@ metadata:
name: {{ template "anchore-engine.enterprise-feeds.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
@@ -7,7 +7,7 @@ metadata:
labels:
app: {{ template "anchore-engine.fullname" . }}
component: {{ $component }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.anchoreEnterpriseFeeds.labels }}
@@ -147,7 +147,7 @@ metadata:
name: {{ template "anchore-engine.enterprise-feeds.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
@@ -9,7 +9,7 @@ metadata:
labels:
app: {{ include "anchore-engine.fullname" . | quote }}
component: {{ $component }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.anchoreGlobal.labels }}
@@ -18,28 +18,29 @@ metadata:
type: Opaque
stringData:
config-ui.yaml: |
engine_uri: "http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreApi.service.port }}/v1"
engine_uri: 'http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreApi.service.port }}/v1'
{{- if and (index .Values "anchore-ui-redis" "externalEndpoint") (not (index .Values "anchore-ui-redis" "enabled")) }}
redis_uri: {{ index .Values "anchore-ui-redis" "externalEndpoint" }}
redis_uri: '{{ index .Values "anchore-ui-redis" "externalEndpoint" }}'
{{- else }}
redis_uri: "redis://:{{ index .Values "anchore-ui-redis" "password" }}@{{ template "redis.fullname" . }}-master:6379"
redis_uri: 'redis://:{{ index .Values "anchore-ui-redis" "password" }}@{{ template "redis.fullname" . }}-master:6379'
{{- end }}
{{- if .Values.anchoreEnterpriseRbac.enabled }}
rbac_uri: "http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreEnterpriseRbac.service.apiPort }}/v1"
rbac_uri: 'http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreEnterpriseRbac.service.apiPort }}/v1'
{{- end }}
{{- if .Values.anchoreEnterpriseReports.enabled }}
reports_uri: "http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreEnterpriseReports.service.port}}/v1"
reports_uri: 'http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreEnterpriseReports.service.port}}/v1'
{{- end }}
{{- if and .Values.postgresql.externalEndpoint (not .Values.postgresql.enabled) }}
appdb_uri: "postgresql://{{ .Values.postgresql.postgresUser }}:{{ .Values.postgresql.postgresPassword }}@{{ .Values.postgresql.externalEndpoint }}/{{ .Values.postgresql.postgresDatabase }}"
appdb_uri: 'postgresql://{{ .Values.postgresql.postgresUser }}:{{ .Values.postgresql.postgresPassword }}@{{ .Values.postgresql.externalEndpoint }}/{{ .Values.postgresql.postgresDatabase }}'
{{- else if and (index .Values "cloudsql" "enabled") (not (index .Values "postgresql" "enabled")) }}
appdb_uri: "postgresql://{{ .Values.postgresql.postgresUser }}:{{ .Values.postgresql.postgresPassword }}@localhost:5432/{{ .Values.postgresql.postgresDatabase }}"
appdb_uri: 'postgresql://{{ .Values.postgresql.postgresUser }}:{{ .Values.postgresql.postgresPassword }}@localhost:5432/{{ .Values.postgresql.postgresDatabase }}'
{{- else }}
appdb_uri: "postgresql://{{ .Values.postgresql.postgresUser }}:{{ .Values.postgresql.postgresPassword }}@{{ template "postgres.fullname" . }}:5432/{{ .Values.postgresql.postgresDatabase }}"
appdb_uri: 'postgresql://{{ .Values.postgresql.postgresUser }}:{{ .Values.postgresql.postgresPassword }}@{{ template "postgres.fullname" . }}:5432/{{ .Values.postgresql.postgresDatabase }}'
{{- end }}
license_path: "/home/anchore/"
license_path: '/home/anchore/'
enable_ssl: {{ .Values.anchoreEnterpriseUi.enableSsl }}
enable_proxy: {{ .Values.anchoreEnterpriseUi.enableProxy }}
allow_shared_login: {{ .Values.anchoreEnterpriseUi.enableSharedLogin }}
redis_flushdb: {{ .Values.anchoreEnterpriseUi.redisFlushdb }}
policy_hub_uri: {{ .Values.anchoreEnterpriseUi.policyHubUri }}
{{- end -}}
@@ -8,7 +8,7 @@ metadata:
labels:
app: {{ include "anchore-engine.fullname" . }}
component: {{ $component }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.anchoreEnterpriseUi.labels }}
@@ -130,7 +130,7 @@ metadata:
labels:
app: {{ template "anchore-engine.fullname" . }}
component: {{ $component }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.anchoreEnterpriseUi.service.labels }}
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
name: {{ template "anchore-engine.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.ingress.labels }}
@@ -5,7 +5,7 @@ metadata:
name: {{ template "anchore-engine.policy-engine.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
@@ -139,7 +139,7 @@ metadata:
name: {{ template "anchore-engine.policy-engine.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
+1 -1
View File
@@ -5,7 +5,7 @@ metadata:
name: {{ template "anchore-engine.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
{{- with .Values.anchoreGlobal.labels }}
@@ -5,7 +5,7 @@ metadata:
name: {{ template "anchore-engine.simplequeue.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
@@ -139,7 +139,7 @@ metadata:
name: {{ template "anchore-engine.simplequeue.fullname" . }}
labels:
app: {{ template "anchore-engine.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
component: {{ $component }}
+13 -2
View File
@@ -66,7 +66,7 @@ ingress:
# Global configuration shared by all anchore-engine services.
anchoreGlobal:
# Image used for all anchore engine deployments (excluding enterprise components).
image: docker.io/anchore/anchore-engine:v0.4.0
image: docker.io/anchore/anchore-engine:v0.4.1
imagePullPolicy: IfNotPresent
# Add additionnal labels to all kubernetes resources
@@ -534,7 +534,7 @@ anchoreEnterpriseReports:
anchoreEnterpriseUi:
# If enabled is set to false, set anchore-ui-redis.enabled to false to ensure that helm doesn't stand up a unneccessary redis instance.
enabled: true
image: docker.io/anchore/enterprise-ui:v0.3.3
image: docker.io/anchore/enterprise-ui:v0.3.4
imagePullPolicy: IfNotPresent
# Set extra environment variables. These will be set on all UI containers.
@@ -557,6 +557,17 @@ anchoreEnterpriseUi:
# user session keys and data is emptied on application startup. If the datastore
# is flushed, any users with active sessions will be required to re-authenticate.
redisFlushdb: true
# The (optional) `policy_hub_uri` key specifies the address of a Policy Hub
# service. The value must be a string containing a properly-formed 'http' or
# 'https' URI, and can be overridden by using the `ANCHORE_POLICY_HUB_URI`
# environment variable.
#
# When this value is set, the Policy Hub component is enabled within the
# Policy Manager view (`/policy`). Note that the availability and integrity of
# Policy Hub data is determined by this component at run-time when this
# component is accessed.
#
policyHubUri: 'http://hub.anchore.io'
# kubernetes service configuration for anchore UI
service: