From 41c48b60a09b4ed3d79b697d6893b06cbca249ff Mon Sep 17 00:00:00 2001 From: Brady Todhunter Date: Wed, 30 Jan 2019 09:32:15 -0800 Subject: [PATCH] Update anchore-engine version (#10911) * Updated Anchore Engine image to v0.3.2 * Updated Anchore Enterprise image to v0.3.3 * Changed image values from image.name, image.tag, & image.pullPolicy to image & imagePullPolicy * Removed unnecessary quotes from templates * Updated chart version to v0.11.0 * Update README Signed-off-by: Brady Todhunter --- stable/anchore-engine/Chart.yaml | 4 +- stable/anchore-engine/README.md | 30 ++++++++--- .../templates/analyzer_deployment.yaml | 4 +- .../templates/api_deployment.yaml | 28 +++++------ .../templates/catalog_deployment.yaml | 20 ++++---- .../templates/engine_configmap.yaml | 50 +++++++++---------- .../enterprise_feeds_deployment.yaml | 22 ++++---- .../templates/enterprise_ui_deployment.yaml | 40 +++++++-------- .../templates/feeds_configmap.yaml | 21 ++++---- stable/anchore-engine/templates/ingress.yaml | 16 +++--- .../templates/policy_engine_deployment.yaml | 18 +++---- .../templates/rbac_configmap.yaml | 28 +++++------ stable/anchore-engine/templates/secrets.yaml | 4 +- .../templates/simplequeue_deployment.yaml | 20 ++++---- stable/anchore-engine/values.yaml | 27 ++++------ 15 files changed, 171 insertions(+), 161 deletions(-) diff --git a/stable/anchore-engine/Chart.yaml b/stable/anchore-engine/Chart.yaml index 86bfc2239a..a346f69981 100644 --- a/stable/anchore-engine/Chart.yaml +++ b/stable/anchore-engine/Chart.yaml @@ -1,6 +1,6 @@ name: anchore-engine -version: 0.10.0 -appVersion: 0.3.1 +version: 0.11.0 +appVersion: 0.3.2 description: Anchore container analysis and policy evaluation engine service keywords: - analysis diff --git a/stable/anchore-engine/README.md b/stable/anchore-engine/README.md index b8afabf5d4..1a1417cd91 100644 --- a/stable/anchore-engine/README.md +++ b/stable/anchore-engine/README.md @@ -43,13 +43,31 @@ The recommended way to install the Anchore Engine Chart is with a customized val defaultAdminPassword: defaultAdminEmail: ``` +## Upgrading to Chart version 0.11.0 +The image map has been removed in all configuration sections in favor of individual keys. This should make configuration for tools like skaffold simpler. If using a custom values file, update your `image.repository`, `image.tag`, & `image.pullPolicy` values with `image` & `imagePullPolicy`. + +##### v0.11.0 image config + +``` +anchoreGlobal: + image: docker.io/anchore/anchore-engine:v0.3.2 + imagePullPolicy: IfNotPresent + +anchoreEnterpriseGlobal: + image: docker.io/anchore/enterprise:v0.3.3 + imagePullPolicy: IfNotPresent + +anchoreEnterpriseUI: + image: docker.io/anchore/enterprise-ui:v0.3.1 + imagePullPolicy: IfNotPresent +``` + ## Upgrading to Chart version 0.10.0 -Ingress resources have been changed to work natively with NGINX ingress controllers. If you're using a different ingress controller, update your values.yaml file accordingly. See the __Using Ingress__ configuration section for examples of NGINX & GCE ingress controller configurations. +Ingress resources have been changed to work natively with NGINX ingress controllers. If you're using a different ingress controller update your values.yaml file accordingly. See the __Using Ingress__ configuration section for examples of NGINX & GCE ingress controller configurations. -Service configs have been moved from the anchoreGlobal section, to individual component sections in the values.yaml file. -If you're upgrading from a previous install and are using custom ports or serviceTypes, be sure to update your values.yaml file accordingly. +Service configs have been moved from the anchoreGlobal section, to individual component sections in the values.yaml file. If you're upgrading from a previous install and are using custom ports or serviceTypes, be sure to update your values.yaml file accordingly. ##### v0.9.0 service config @@ -74,8 +92,7 @@ Version 0.9.0 of the anchore-engine helm chart includes major changes to the arc `helm upgrade stable/anchore-engine` -When upgrading the Chart from version 0.2.6 to version 0.9.0, it will take approximately 5 minutes for anchore-engine to upgrade the database. -To ensure that the upgrade has completed, run the `anchore-cli system status` command and verify the engine & db versions match the output below. +When upgrading the Chart from version 0.2.6 to version 0.9.0, it will take approximately 5 minutes for anchore-engine to upgrade the database. To ensure that the upgrade has completed, run the `anchore-cli system status` command and verify the engine & db versions match the output below. ``` Engine DB Version: 0.0.8 @@ -84,8 +101,7 @@ Engine Code Version: 0.3.0 ## Configuration -All configurations should be appended to your custom `anchore_values.yaml` file and utilized when installing the chart. -While the configuration options of Anchore Engine are extensive, the options provided by the chart are: +All configurations should be appended to your custom `anchore_values.yaml` file and utilized when installing the chart. While the configuration options of Anchore Engine are extensive, the options provided by the chart are: ### Exposing the service outside the cluster: diff --git a/stable/anchore-engine/templates/analyzer_deployment.yaml b/stable/anchore-engine/templates/analyzer_deployment.yaml index 0e7daaa957..646e776ef6 100644 --- a/stable/anchore-engine/templates/analyzer_deployment.yaml +++ b/stable/anchore-engine/templates/analyzer_deployment.yaml @@ -27,8 +27,8 @@ spec: spec: containers: - name: {{ .Chart.Name }}-{{ $component }} - image: {{ .Values.anchoreGlobal.image.repository }}:{{ .Values.anchoreGlobal.image.tag }} - imagePullPolicy: {{ .Values.anchoreGlobal.image.pullPolicy }} + image: {{ .Values.anchoreGlobal.image }} + imagePullPolicy: {{ .Values.anchoreGlobal.imagePullPolicy }} command: ["/usr/local/bin/anchore-manager"] args: ["service", "start", "analyzer"] envFrom: diff --git a/stable/anchore-engine/templates/api_deployment.yaml b/stable/anchore-engine/templates/api_deployment.yaml index 6cbba1f9e8..c297707be4 100644 --- a/stable/anchore-engine/templates/api_deployment.yaml +++ b/stable/anchore-engine/templates/api_deployment.yaml @@ -2,23 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ template "anchore-engine.api.fullname" . }}" + name: {{ template "anchore-engine.api.fullname" . }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} spec: selector: matchLabels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} replicas: {{ .Values.anchoreApi.replicaCount }} template: metadata: labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} {{- if .Values.anchoreApi.annotations }} annotations: @@ -28,7 +28,7 @@ spec: volumes: - name: config-volume configMap: - name: {{ template "anchore-engine.fullname" .}} + name: {{ template "anchore-engine.fullname" . }} {{- if and .Values.anchoreEnterpriseGlobal.enabled .Values.anchoreEnterpriseRbac.enabled }} - name: anchore-license secret: @@ -43,9 +43,9 @@ spec: secretName: {{ .Values.anchoreGlobal.internalServicesSsl.certSecret }} {{- end }} containers: - - name: {{ .Chart.Name }}-{{ $component }} - image: {{ .Values.anchoreGlobal.image.repository }}:{{ .Values.anchoreGlobal.image.tag }} - imagePullPolicy: {{ .Values.anchoreGlobal.image.pullPolicy }} + - name: "{{ .Chart.Name }}-{{ $component }}" + image: {{ .Values.anchoreGlobal.image }} + imagePullPolicy: {{ .Values.anchoreGlobal.imagePullPolicy }} command: ["/usr/local/bin/anchore-manager"] args: ["service", "start", "apiext"] envFrom: @@ -92,8 +92,8 @@ spec: {{- if and .Values.anchoreEnterpriseGlobal.enabled .Values.anchoreEnterpriseRbac.enabled }} - name: {{ .Chart.Name }}-rbac-manager - image: "{{ .Values.anchoreEnterpriseGlobal.image.repository }}:{{ .Values.anchoreEnterpriseGlobal.image.tag }}" - imagePullPolicy: {{ .Values.anchoreEnterpriseGlobal.image.pullPolicy }} + image: {{ .Values.anchoreEnterpriseGlobal.image }} + imagePullPolicy: {{ .Values.anchoreEnterpriseGlobal.imagePullPolicy }} command: ["/usr/local/bin/anchore-enterprise-manager"] args: ["service", "start", "rbac_manager"] envFrom: @@ -142,8 +142,8 @@ spec: {{ toYaml .Values.anchoreEnterpriseRbac.managerResources | indent 10 }} - name: {{ .Chart.Name }}-rbac-authorizer - image: "{{ .Values.anchoreEnterpriseGlobal.image.repository }}:{{ .Values.anchoreEnterpriseGlobal.image.tag }}" - imagePullPolicy: {{ .Values.anchoreEnterpriseGlobal.image.pullPolicy }} + image: {{ .Values.anchoreEnterpriseGlobal.image }} + imagePullPolicy: {{ .Values.anchoreEnterpriseGlobal.imagePullPolicy }} command: ["/usr/local/bin/anchore-enterprise-manager"] args: ["service", "start", "rbac_authorizer"] envFrom: diff --git a/stable/anchore-engine/templates/catalog_deployment.yaml b/stable/anchore-engine/templates/catalog_deployment.yaml index b48dd4dc39..9e4107d369 100644 --- a/stable/anchore-engine/templates/catalog_deployment.yaml +++ b/stable/anchore-engine/templates/catalog_deployment.yaml @@ -2,23 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ template "anchore-engine.catalog.fullname" . }}" + name: {{ template "anchore-engine.catalog.fullname" . }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} component: {{ $component }} spec: selector: matchLabels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} replicas: {{ .Values.anchoreCatalog.replicaCount }} template: metadata: labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} {{- if .Values.anchoreCatalog.annotations }} annotations: @@ -27,8 +27,8 @@ spec: spec: containers: - name: {{ .Chart.Name }}-{{ $component }} - image: {{ .Values.anchoreGlobal.image.repository }}:{{ .Values.anchoreGlobal.image.tag }} - imagePullPolicy: {{ .Values.anchoreGlobal.image.pullPolicy }} + image: {{ .Values.anchoreGlobal.image }} + imagePullPolicy: {{ .Values.anchoreGlobal.imagePullPolicy }} command: ["/usr/local/bin/anchore-manager"] args: ["service", "start", "catalog"] envFrom: @@ -75,7 +75,7 @@ spec: volumes: - name: config-volume configMap: - name: {{ template "anchore-engine.fullname" .}} + name: {{ template "anchore-engine.fullname" . }} {{- if .Values.anchoreGlobal.internalServicesSslEnabled }} - name: certs secret: @@ -101,7 +101,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 }} diff --git a/stable/anchore-engine/templates/engine_configmap.yaml b/stable/anchore-engine/templates/engine_configmap.yaml index 9d177af1eb..5190a65640 100644 --- a/stable/anchore-engine/templates/engine_configmap.yaml +++ b/stable/anchore-engine/templates/engine_configmap.yaml @@ -1,12 +1,12 @@ kind: ConfigMap apiVersion: v1 metadata: - name: "{{ template "anchore-engine.fullname" . }}" + name: {{ template "anchore-engine.fullname" . }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} data: ANCHORE_DB_NAME: {{ index .Values "postgresql" "postgresDatabase" | quote }} ANCHORE_DB_USER: {{ index .Values "postgresql" "postgresUser" | quote }} @@ -25,7 +25,7 @@ data: cleanup_images: {{ .Values.anchoreGlobal.cleanupImages }} allow_awsecr_iam_auto: {{ .Values.anchoreGlobal.allowECRUseIAMRole }} - host_id: ${ANCHORE_POD_NAME} + host_id: "${ANCHORE_POD_NAME}" internal_ssl_verify: {{ .Values.anchoreGlobal.internalServicesSsl.verifyCerts }} auto_restart_services: false @@ -68,12 +68,12 @@ data: snyk: false {{- end }} {{- if and .Values.anchoreEnterpriseGlobal.enabled .Values.anchoreEnterpriseFeeds.enabled }} - url: 'http://{{ template "anchore-engine.enterprise-feeds.fullname" . }}:{{ .Values.anchoreEnterpriseFeeds.service.port }}/v1/feeds' + url: "http://{{ template "anchore-engine.enterprise-feeds.fullname" . }}:{{ .Values.anchoreEnterpriseFeeds.service.port }}/v1/feeds" client_url: token_url: {{- else }} - client_url: 'https://ancho.re/v1/account/users' - token_url: 'https://ancho.re/oauth/token' + client_url: "https://ancho.re/v1/account/users" + token_url: "https://ancho.re/oauth/token" anonymous_user_username: anon@ancho.re anonymous_user_password: pbiU2RYZ2XrmYQ {{- end }} @@ -85,7 +85,7 @@ data: credentials: database: - db_connect: 'postgresql+pg8000://${ANCHORE_DB_USER}:${ANCHORE_DB_PASSWORD}@${ANCHORE_DB_HOST}/${ANCHORE_DB_NAME}' + db_connect: "postgresql+pg8000://${ANCHORE_DB_USER}:${ANCHORE_DB_PASSWORD}@${ANCHORE_DB_HOST}/${ANCHORE_DB_NAME}" db_connect_args: timeout: {{ .Values.anchoreGlobal.dbConfig.timeout }} ssl: {{ .Values.anchoreGlobal.dbConfig.ssl }} @@ -97,7 +97,7 @@ data: enabled: true require_auth: true endpoint_hostname: {{ template "anchore-engine.api.fullname" . }} - listen: '0.0.0.0' + listen: 0.0.0.0 port: {{ .Values.anchoreApi.service.port }} {{- if and .Values.anchoreEnterpriseGlobal.enabled .Values.anchoreEnterpriseRbac.enabled }} authorization_handler: external @@ -105,34 +105,34 @@ data: endpoint: "http://localhost:{{ .Values.anchoreEnterpriseRbac.service.authPort }}" {{- end }} ssl_enable: {{ .Values.anchoreGlobal.internalServicesSslEnabled }} - ssl_cert: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }} - ssl_key: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }} + ssl_cert: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }}" + ssl_key: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }}" analyzer: enabled: true require_auth: true endpoint_hostname: {{ template "anchore-engine.analyzer.fullname" . }} - listen: '0.0.0.0' + listen: 0.0.0.0 port: {{ .Values.anchoreAnalyzer.containerPort }} cycle_timer_seconds: 1 cycle_timers: {{ toYaml .Values.anchoreAnalyzer.cycleTimers | indent 10 }} max_threads: {{ .Values.anchoreAnalyzer.concurrentTasksPerWorker }} analyzer_driver: 'nodocker' - ssl_cert: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }} - ssl_key: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{ .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }} + ssl_cert: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }}" + ssl_key: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{ .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }}" ssl_enable: {{ .Values.anchoreGlobal.internalServicesSslEnabled }} catalog: enabled: true require_auth: true endpoint_hostname: {{ template "anchore-engine.catalog.fullname" . }} - listen: '0.0.0.0' + listen: 0.0.0.0 port: {{ .Values.anchoreCatalog.service.port }} - cycle_timer_seconds: '1' + cycle_timer_seconds: 1 cycle_timers: {{ toYaml .Values.anchoreCatalog.cycleTimers | indent 10 }} ssl_enable: {{ .Values.anchoreGlobal.internalServicesSslEnabled }} - ssl_cert: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }} - ssl_key: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }} + ssl_cert: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }}" + ssl_key: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }}" event_log: {{ toYaml .Values.anchoreCatalog.events | indent 10 }} archive: @@ -141,20 +141,20 @@ data: enabled: true require_auth: true endpoint_hostname: {{ template "anchore-engine.simplequeue.fullname" . }} - listen: '0.0.0.0' + listen: 0.0.0.0 port: {{ .Values.anchoreSimpleQueue.service.port }} ssl_enable: {{ .Values.anchoreGlobal.internalServicesSslEnabled }} - ssl_cert: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }} - ssl_key: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }} + ssl_cert: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }}" + ssl_key: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }}" policy_engine: enabled: true require_auth: true endpoint_hostname: {{ template "anchore-engine.policy-engine.fullname" . }} - listen: '0.0.0.0' + listen: 0.0.0.0 port: {{ .Values.anchorePolicyEngine.service.port }} cycle_timer_seconds: 1 cycle_timers: {{ toYaml .Values.anchorePolicyEngine.cycleTimers | indent 10 }} - ssl_cert: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }} - ssl_key: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }} + ssl_cert: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }}" + ssl_key: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }}" ssl_enable: {{ .Values.anchoreGlobal.internalServicesSslEnabled }} diff --git a/stable/anchore-engine/templates/enterprise_feeds_deployment.yaml b/stable/anchore-engine/templates/enterprise_feeds_deployment.yaml index 75b1f23885..6eda35f579 100644 --- a/stable/anchore-engine/templates/enterprise_feeds_deployment.yaml +++ b/stable/anchore-engine/templates/enterprise_feeds_deployment.yaml @@ -3,23 +3,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ template "anchore-engine.enterprise-feeds.fullname" . }}" + name: {{ template "anchore-engine.enterprise-feeds.fullname" . }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} spec: selector: matchLabels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} replicas: 1 template: metadata: labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} {{- if .Values.anchoreEnterpriseFeeds.annotations }} annotations: @@ -29,7 +29,7 @@ spec: volumes: - name: config-volume configMap: - name: {{ template "anchore-engine.enterprise-feeds.fullname" .}} + name: {{ template "anchore-engine.enterprise-feeds.fullname" . }} - name: scratch-volume {{ toYaml .Values.anchoreEnterpriseFeeds.scratchVolume.details | indent 10 }} - name: anchore-license @@ -38,9 +38,9 @@ spec: imagePullSecrets: - name: {{ .Values.anchoreEnterpriseGlobal.imagePullSecretName }} containers: - - name: {{ .Chart.Name }}-{{ $component }} - image: "{{ .Values.anchoreEnterpriseGlobal.image.repository }}:{{ .Values.anchoreEnterpriseGlobal.image.tag }}" - imagePullPolicy: {{ .Values.anchoreEnterpriseGlobal.image.pullPolicy }} + - name: "{{ .Chart.Name }}-{{ $component }}" + image: {{ .Values.anchoreEnterpriseGlobal.image }} + imagePullPolicy: {{ .Values.anchoreEnterpriseGlobal.imagePullPolicy }} command: ["/usr/local/bin/anchore-enterprise-manager"] args: ["service", "start", "feeds"] ports: @@ -118,7 +118,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 }} diff --git a/stable/anchore-engine/templates/enterprise_ui_deployment.yaml b/stable/anchore-engine/templates/enterprise_ui_deployment.yaml index dbcf1837e5..6f1be1b607 100644 --- a/stable/anchore-engine/templates/enterprise_ui_deployment.yaml +++ b/stable/anchore-engine/templates/enterprise_ui_deployment.yaml @@ -4,27 +4,27 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ include "anchore-engine.enterprise-ui.fullname" . | quote }} + name: {{ include "anchore-engine.enterprise-ui.fullname" . }} labels: - app: {{ include "anchore-engine.fullname" . | quote }} + app: {{ include "anchore-engine.fullname" . }} component: {{ $component }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} spec: selector: matchLabels: - app: "{{ template "anchore-engine.fullname" .}}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} replicas: 1 template: metadata: labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} {{- if .Values.anchoreEnterpriseUi.annotations }} annotations: {{ toYaml .Values.anchoreEnterpriseUi.annotations | indent 8 }} @@ -37,9 +37,9 @@ spec: imagePullSecrets: - name: {{ .Values.anchoreEnterpriseGlobal.imagePullSecretName }} containers: - - name: {{ .Chart.Name }}-{{ $component }} - image: {{ .Values.anchoreEnterpriseUi.image.repository }}:{{ .Values.anchoreEnterpriseUi.image.tag }} - imagePullPolicy: {{ .Values.anchoreEnterpriseUi.image.pullPolicy }} + - name: "{{ .Chart.Name }}-{{ $component }}" + image: {{ .Values.anchoreEnterpriseUi.image }} + imagePullPolicy: {{ .Values.anchoreEnterpriseUi.imagePullPolicy }} env: - name: REDIS_PASSWORD valueFrom: @@ -51,15 +51,15 @@ spec: value: {{ index .Values "anchore-ui-redis" "externalEndpoint" | quote }} {{- else }} - name: ANCHORE_REDIS_URI - value: {{ printf "redis://:$(REDIS_PASSWORD)@%s-master:6379" ( include "redis.fullname" . ) }} + value: "redis://:$(REDIS_PASSWORD)@{{ template "redis.fullname" . }}-master:6379" {{- end }} - name: ANCHORE_ENGINE_URI - value: 'http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreApi.service.port }}/v1' + value: "http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreApi.service.port }}/v1" - name: ANCHORE_LICENSE_PATH - value: '/' + value: "/" {{- if .Values.anchoreEnterpriseRbac.enabled }} - name: ANCHORE_RBAC_URI - value: 'http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreEnterpriseRbac.service.apiPort }}/v1' + value: "http://{{ template "anchore-engine.api.fullname" . }}:{{ .Values.anchoreEnterpriseRbac.service.apiPort }}/v1" {{- end }} - name: ANCHORE_ENABLE_SSL value: '{{ .Values.anchoreEnterpriseUi.enableSsl }}' @@ -73,7 +73,7 @@ spec: name: enterprise-ui volumeMounts: - name: anchore-license - mountPath: "/license.yaml" + mountPath: /license.yaml subPath: license.yaml livenessProbe: httpGet: @@ -111,11 +111,11 @@ kind: Service metadata: name: {{ include "anchore-engine.enterprise-ui.fullname" . | quote }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} {{- if .Values.anchoreEnterpriseUi.service.annotations }} annotations: {{ toYaml .Values.anchoreEnterpriseUi.service.annotations | indent 4 }} @@ -129,7 +129,7 @@ spec: protocol: TCP targetPort: 3000 selector: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} {{- end -}} diff --git a/stable/anchore-engine/templates/feeds_configmap.yaml b/stable/anchore-engine/templates/feeds_configmap.yaml index a8f7d9366e..28cf47fde8 100644 --- a/stable/anchore-engine/templates/feeds_configmap.yaml +++ b/stable/anchore-engine/templates/feeds_configmap.yaml @@ -1,14 +1,15 @@ {{- if and .Values.anchoreEnterpriseGlobal.enabled .Values.anchoreEnterpriseFeeds.enabled -}} +{{- $component := "enterprise-feeds" -}} apiVersion: v1 kind: ConfigMap metadata: - name: "{{ template "anchore-engine.enterprise-feeds.fullname" . }}" + name: {{ template "anchore-engine.enterprise-feeds.fullname" . }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - component: "enterprise-feeds" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + component: {{ $component }} data: config.yaml: | # Anchore Enterprise Service Configuration File @@ -32,7 +33,7 @@ data: credentials: database: - db_connect: 'postgresql+pg8000://${ANCHORE_DB_USER}:${ANCHORE_DB_PASSWORD}@${ANCHORE_DB_HOST}/${ANCHORE_DB_NAME}' + db_connect: "postgresql+pg8000://${ANCHORE_DB_USER}:${ANCHORE_DB_PASSWORD}@${ANCHORE_DB_HOST}/${ANCHORE_DB_NAME}" db_connect_args: timeout: {{ .Values.anchoreEnterpriseFeeds.dbConfig.timeout }} ssl: {{ .Values.anchoreEnterpriseFeeds.dbConfig.ssl }} @@ -44,13 +45,13 @@ data: enabled: true require_auth: true endpoint_hostname: {{ template "anchore-engine.enterprise-feeds.fullname" . }} - listen: '0.0.0.0' + listen: 0.0.0.0 port: {{ .Values.anchoreEnterpriseFeeds.service.port }} # Time delay in seconds between consecutive driver runs for processing data cycle_timers: {{ toYaml .Values.anchoreEnterpriseFeeds.cycleTimers | indent 10 }} # Staging space for holding normalized output from drivers. - local_workspace: "{{ .Values.anchoreEnterpriseFeeds.scratchVolume.mountPath }}" + local_workspace: {{ .Values.anchoreEnterpriseFeeds.scratchVolume.mountPath }} # Drivers process data from external sources and store normalized data in local_workspace. Processing large data sets # is a time consuming process for some drivers. To speed it up the container is shipped with pre-loaded data which is used # by default if local_workspace is empty. @@ -84,7 +85,7 @@ data: enabled: {{ default "true" .Values.anchoreEnterpriseFeeds.alpineDriverEnabled }} snyk: enabled: {{ default "true" .Values.anchoreEnterpriseFeeds.snykDriverEnabled }} - ssl_cert: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }} - ssl_key: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }} + ssl_cert: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }}" + ssl_key: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }}" ssl_enable: {{ .Values.anchoreGlobal.internalServicesSslEnabled }} {{- end -}} diff --git a/stable/anchore-engine/templates/ingress.yaml b/stable/anchore-engine/templates/ingress.yaml index 7b91d023cf..afd33f6a39 100644 --- a/stable/anchore-engine/templates/ingress.yaml +++ b/stable/anchore-engine/templates/ingress.yaml @@ -2,12 +2,12 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: - name: "{{ template "anchore-engine.fullname" . }}" + name: {{ template "anchore-engine.fullname" . }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} {{- if .Values.anchoreGlobal.ingress.annotations }} annotations: {{ toYaml .Values.anchoreGlobal.ingress.annotations | indent 4 }} @@ -31,7 +31,7 @@ spec: paths: - path: {{ $.Values.anchoreApi.ingress.path }} backend: - serviceName: "{{ template "anchore-engine.api.fullname" $ }}" + serviceName: {{ template "anchore-engine.api.fullname" $ }} servicePort: {{ $.Values.anchoreApi.service.port }} {{- end }} {{- if and (and .Values.anchoreEnterpriseGlobal.enabled .Values.anchoreEnterpriseUi.enabled) .Values.anchoreEnterpriseUi.ingress.hosts }} @@ -41,7 +41,7 @@ spec: paths: - path: {{ $.Values.anchoreEnterpriseUi.ingress.path }} backend: - serviceName: "{{ template "anchore-engine.enterprise-ui.fullname" $ }}" + serviceName: {{ template "anchore-engine.enterprise-ui.fullname" $ }} servicePort: {{ $.Values.anchoreEnterpriseUi.service.port }} {{- end }} {{- end }} @@ -50,12 +50,12 @@ spec: paths: - path: {{ $.Values.anchoreApi.ingress.path }} backend: - serviceName: "{{ template "anchore-engine.api.fullname" $ }}" + serviceName: {{ template "anchore-engine.api.fullname" $ }} servicePort: {{ $.Values.anchoreApi.service.port }} {{- if and .Values.anchoreEnterpriseGlobal.enabled .Values.anchoreEnterpriseUi.enabled }} - path: {{ $.Values.anchoreEnterpriseUi.ingress.path }} backend: - serviceName: "{{ template "anchore-engine.enterprise-ui.fullname" $ }}" + serviceName: {{ template "anchore-engine.enterprise-ui.fullname" $ }} servicePort: {{ $.Values.anchoreEnterpriseUi.service.port }} {{- end }} {{- end }} diff --git a/stable/anchore-engine/templates/policy_engine_deployment.yaml b/stable/anchore-engine/templates/policy_engine_deployment.yaml index a5da658f53..1bdacab637 100644 --- a/stable/anchore-engine/templates/policy_engine_deployment.yaml +++ b/stable/anchore-engine/templates/policy_engine_deployment.yaml @@ -2,23 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ template "anchore-engine.policy-engine.fullname" . }}" + name: {{ template "anchore-engine.policy-engine.fullname" . }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} component: {{ $component }} spec: selector: matchLabels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} replicas: {{ .Values.anchorePolicyEngine.replicaCount }} template: metadata: labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} {{- if .Values.anchorePolicyEngine.annotations }} annotations: @@ -27,8 +27,8 @@ spec: spec: containers: - name: {{ .Chart.Name }}-{{ $component }} - image: {{ .Values.anchoreGlobal.image.repository }}:{{ .Values.anchoreGlobal.image.tag }} - imagePullPolicy: {{ .Values.anchoreGlobal.image.pullPolicy }} + image: {{ .Values.anchoreGlobal.image }} + imagePullPolicy: {{ .Values.anchoreGlobal.imagePullPolicy }} command: ["/usr/local/bin/anchore-manager"] args: ["service", "start", "policy_engine"] envFrom: @@ -101,7 +101,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 }} diff --git a/stable/anchore-engine/templates/rbac_configmap.yaml b/stable/anchore-engine/templates/rbac_configmap.yaml index 47f9982ae3..7f88a93f23 100644 --- a/stable/anchore-engine/templates/rbac_configmap.yaml +++ b/stable/anchore-engine/templates/rbac_configmap.yaml @@ -1,15 +1,15 @@ {{- if and .Values.anchoreEnterpriseGlobal.enabled .Values.anchoreEnterpriseRbac.enabled -}} - +{{- $component := "enterprise-rbac" -}} apiVersion: v1 kind: ConfigMap metadata: - name: "{{ template "anchore-engine.enterprise.fullname" . }}" + name: {{ template "anchore-engine.enterprise.fullname" . }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - component: "enterprise-rbac" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + component: {{ $component }} data: config.yaml: | # Anchore Enterprise Service Configuration File @@ -33,7 +33,7 @@ data: credentials: database: - db_connect: 'postgresql+pg8000://${ANCHORE_DB_USER}:${ANCHORE_DB_PASSWORD}@${ANCHORE_DB_HOST}/${ANCHORE_DB_NAME}' + db_connect: "postgresql+pg8000://${ANCHORE_DB_USER}:${ANCHORE_DB_PASSWORD}@${ANCHORE_DB_HOST}/${ANCHORE_DB_NAME}" db_connect_args: timeout: {{ .Values.anchoreGlobal.dbConfig.timeout }} ssl: {{ .Values.anchoreGlobal.dbConfig.ssl }} @@ -46,21 +46,21 @@ data: enabled: True require_auth: True endpoint_hostname: localhost - listen: '127.0.0.1' + listen: 127.0.0.1 port: {{ .Values.anchoreEnterpriseRbac.service.authPort }} - ssl_cert: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }} - ssl_key: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }} + ssl_cert: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }}" + ssl_key: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }}" ssl_enable: {{ .Values.anchoreGlobal.internalServicesSslEnabled }} rbac_manager: enabled: True require_auth: True endpoint_hostname: {{ template "anchore-engine.api.fullname" . }} - listen: '0.0.0.0' + listen: 0.0.0.0 port: {{ .Values.anchoreEnterpriseRbac.service.apiPort }} authorization_handler: external authorization_handler_config: - endpoint: 'http://localhost:{{ .Values.anchoreEnterpriseRbac.service.authPort }}' - ssl_cert: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }} - ssl_key: {{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }} + endpoint: "http://localhost:{{ .Values.anchoreEnterpriseRbac.service.authPort }}" + ssl_cert: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretCertName }}" + ssl_key: "{{ .Values.anchoreGlobal.internalServicesSsl.certDir -}}/{{- .Values.anchoreGlobal.internalServicesSsl.certSecretKeyName }}" ssl_enable: {{ .Values.anchoreGlobal.internalServicesSslEnabled }} {{- end -}} diff --git a/stable/anchore-engine/templates/secrets.yaml b/stable/anchore-engine/templates/secrets.yaml index c47a63853c..3d27aadb82 100644 --- a/stable/anchore-engine/templates/secrets.yaml +++ b/stable/anchore-engine/templates/secrets.yaml @@ -5,8 +5,8 @@ metadata: labels: app: {{ template "anchore-engine.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} type: Opaque stringData: ANCHORE_ADMIN_PASSWORD: {{ .Values.anchoreGlobal.defaultAdminPassword | quote }} diff --git a/stable/anchore-engine/templates/simplequeue_deployment.yaml b/stable/anchore-engine/templates/simplequeue_deployment.yaml index 993f328c8c..59dfa4fab7 100644 --- a/stable/anchore-engine/templates/simplequeue_deployment.yaml +++ b/stable/anchore-engine/templates/simplequeue_deployment.yaml @@ -2,23 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ template "anchore-engine.simplequeue.fullname" . }}" + name: {{ template "anchore-engine.simplequeue.fullname" . }} labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} component: {{ $component }} spec: selector: matchLabels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} replicas: {{ .Values.anchoreSimpleQueue.replicaCount }} template: metadata: labels: - app: "{{ template "anchore-engine.fullname" . }}" + app: {{ template "anchore-engine.fullname" . }} component: {{ $component }} {{- if .Values.anchoreSimpleQueue.annotations }} annotations: @@ -26,9 +26,9 @@ spec: {{- end }} spec: containers: - - name: {{ .Chart.Name }}-{{ $component }} - image: {{ .Values.anchoreGlobal.image.repository }}:{{ .Values.anchoreGlobal.image.tag }} - imagePullPolicy: {{ .Values.anchoreGlobal.image.pullPolicy }} + - name: "{{ .Chart.Name }}-{{ $component }}" + image: {{ .Values.anchoreGlobal.image }} + imagePullPolicy: {{ .Values.anchoreGlobal.imagePullPolicy }} command: ["/usr/local/bin/anchore-manager"] args: ["service", "start", "simplequeue"] envFrom: @@ -101,7 +101,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 }} diff --git a/stable/anchore-engine/values.yaml b/stable/anchore-engine/values.yaml index 71bb36c8c4..76cb88c4a1 100644 --- a/stable/anchore-engine/values.yaml +++ b/stable/anchore-engine/values.yaml @@ -21,11 +21,8 @@ postgresql: # Global configuration shared by all anchore-engine services. anchoreGlobal: # Image used for all anchore engine deployments (excluding enterprise components). - image: - # Can use 'latest' tag but not recommended - repository: docker.io/anchore/anchore-engine - tag: v0.3.1 - pullPolicy: IfNotPresent + image: docker.io/anchore/anchore-engine:v0.3.2 + imagePullPolicy: IfNotPresent # Create an ingress resource for all external anchore engine services. # By default this chart is setup to use the NGINX ingress controller which needs to be installed & configured on your cluster. @@ -74,10 +71,10 @@ anchoreGlobal: internalServicesSsl: # specify whether cert is verfied against the local certifacte bundle (allow self-signed certs if set to false) verifyCerts: false - certDir: "/certs" + certDir: /certs certSecret: Null - certSecretKeyName: "tls.key" - certSecretCertName: "tls.crt" + certSecretKeyName: tls.key + certSecretCertName: tls.crt # To enable webhooks, set webhooksEnabled: true webhooksEnabled: false @@ -320,15 +317,13 @@ anchoreEnterpriseGlobal: # Name of kubernetes secret containing your license.yaml file. # Create this secret with the following command - kubectl create secret generic anchore-license --from-file=license.yaml= licenseSecretName: anchore-enterprise-license + + image: docker.io/anchore/enterprise:v0.3.3 + imagePullPolicy: IfNotPresent # 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= --docker-password= --docker-email= imagePullSecretName: anchore-enterprise-pullcreds - image: - repository: docker.io/anchore/enterprise - tag: v0.3.1 - pullPolicy: IfNotPresent - # Configure the second postgres database instance for the enterprise feeds service. # Only utilized if anchoreEnterpriseFeeds.enabled: true anchore-feeds-db: @@ -434,10 +429,8 @@ anchoreEnterpriseUi: # single session from being viewed within multiple *tabs* inside the same browser. enableSharedLogin: true - image: - repository: docker.io/anchore/enterprise-ui - tag: v0.3.1 - pullPolicy: IfNotPresent + image: docker.io/anchore/enterprise-ui:v0.3.1 + imagePullPolicy: IfNotPresent # kubernetes service configuration for anchore UI service: