From 48d7786189cee8ebdf3ba5e2b634d726c12fe3c1 Mon Sep 17 00:00:00 2001
From: Zach Hill <zach@anchore.com>
Date: Mon, 9 Apr 2018 09:21:08 -0700
Subject: [PATCH] [stable/anchore-engine] Fixes error in K8s v1.9 caused by
 read-only configmap mounts and locks application version in chart. (#4802)

Adds new default value for globalConfig.configDir to specify different config dir than the where configMap is mounted.

Adds specific app version and specific tag instead of 'latest' to ensure no unexpected upgrades.
---
 stable/anchore-engine/Chart.yaml                      | 4 ++--
 stable/anchore-engine/templates/core_configmap.yaml   | 2 +-
 stable/anchore-engine/templates/worker_configmap.yaml | 2 +-
 stable/anchore-engine/values.yaml                     | 7 +++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/stable/anchore-engine/Chart.yaml b/stable/anchore-engine/Chart.yaml
index 51e44fa1a4..8f9f8c0a7d 100644
--- a/stable/anchore-engine/Chart.yaml
+++ b/stable/anchore-engine/Chart.yaml
@@ -1,6 +1,6 @@
 name: anchore-engine
-version: 0.1.4
-appVersion: 0.1.6
+version: 0.1.5
+appVersion: 0.1.9
 description: Anchore container analysis and policy evaluation engine service
 keywords:
  - analysis
diff --git a/stable/anchore-engine/templates/core_configmap.yaml b/stable/anchore-engine/templates/core_configmap.yaml
index 75dfb0e20a..60e69dfedf 100644
--- a/stable/anchore-engine/templates/core_configmap.yaml
+++ b/stable/anchore-engine/templates/core_configmap.yaml
@@ -11,7 +11,7 @@ metadata:
 data:
   config.yaml: |
     # Anchore Service Configuration File from ConfigMap
-    service_dir: {{ default "/config" .Values.globalConfig.configDir }}
+    service_dir: {{ .Values.globalConfig.configDir }}
     tmp_dir: "/tmp"
 
     allow_awsecr_iam_auto: {{ .Values.globalConfig.allowECRUseIAMRole }}
diff --git a/stable/anchore-engine/templates/worker_configmap.yaml b/stable/anchore-engine/templates/worker_configmap.yaml
index ec8502e3e9..9861ae2e6f 100644
--- a/stable/anchore-engine/templates/worker_configmap.yaml
+++ b/stable/anchore-engine/templates/worker_configmap.yaml
@@ -15,7 +15,7 @@ data:
     # General system-wide configuration options, these should not need to
     # be altered for basic operation
     #
-    service_dir: {{ default "/config" .Values.globalConfig.configDir }}
+    service_dir: {{ .Values.globalConfig.configDir }}
     tmp_dir: {{ default "/tmp" .Values.workerConfig.analyzerScratchDir }}
 
     allow_awsecr_iam_auto: {{ .Values.globalConfig.allowECRUseIAMRole }}
diff --git a/stable/anchore-engine/values.yaml b/stable/anchore-engine/values.yaml
index d467f75053..12216c4b66 100644
--- a/stable/anchore-engine/values.yaml
+++ b/stable/anchore-engine/values.yaml
@@ -11,8 +11,8 @@ service:
     k8sImagePolicyWebhook: 8338
 
 image:
-  # Specific version tags are also available, e.g. v0.1.5, v0.1.6,...
-  tag: docker.io/anchore/anchore-engine:latest
+  # Can use 'latest' but not recommended
+  tag: docker.io/anchore/anchore-engine:v0.1.9
   # pullPolicy: IfNotPresent
 
 # Used to create Ingress record (should used with service.type: ClusterIP or NodePort depending on platform)
@@ -42,6 +42,9 @@ postgresql:
 
 # Global configuration shared by both core and worker
 globalConfig:
+  # Set where default configs are placed at startup. This must be a writable location for the pod.
+  configDir: /anchore_service_config
+
   dbConfig:
     timeout: 120
     # Use ssl, but the default postgresql config in helm's stable repo does not support ssl on server side, so this should be set for external dbs only for the time being