From 94f0bc2a4253f3f8087ca949116088bc8329a38f Mon Sep 17 00:00:00 2001
From: Maksim Paskal <paskal.maksim@gmail.com>
Date: Sun, 16 Jan 2022 06:22:41 +0200
Subject: [PATCH] refactor chart release (#71)

Signed-off-by: Maksim Paskal <paskal.maksim@gmail.com>
---
 charts/envoy-control-plane/Chart.yaml            |  3 ++-
 .../templates/control-plane.yaml                 |  2 +-
 charts/envoy-control-plane/templates/envoy.yaml  |  2 +-
 .../envoy-control-plane/templates/testPods.yaml  | 16 ++++++++++++----
 charts/envoy-control-plane/values.yaml           |  4 ++--
 examples/zone-aware/docker-compose.yaml          |  2 +-
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/charts/envoy-control-plane/Chart.yaml b/charts/envoy-control-plane/Chart.yaml
index 6fa46d1..ddc8fb8 100644
--- a/charts/envoy-control-plane/Chart.yaml
+++ b/charts/envoy-control-plane/Chart.yaml
@@ -1,4 +1,5 @@
 apiVersion: v2
 icon: https://helm.sh/img/helm.svg
 name: envoy-control-plane
-version: v0.0.3
\ No newline at end of file
+version: v0.0.4
+appVersion: v0.3.5
\ No newline at end of file
diff --git a/charts/envoy-control-plane/templates/control-plane.yaml b/charts/envoy-control-plane/templates/control-plane.yaml
index fb62346..c0ac5eb 100644
--- a/charts/envoy-control-plane/templates/control-plane.yaml
+++ b/charts/envoy-control-plane/templates/control-plane.yaml
@@ -77,7 +77,7 @@ spec:
           name: envoy-control-plane-certs
       containers:
       - name: envoy-control-plane
-        image: {{ .Values.registry.image | quote }}
+        image: {{ tpl .Values.registry.image . | quote }}
         imagePullPolicy: {{ .Values.registry.imagePullPolicy | quote }}
         env:
         - name: MY_POD_NAMESPACE
diff --git a/charts/envoy-control-plane/templates/envoy.yaml b/charts/envoy-control-plane/templates/envoy.yaml
index cbf80af..e3068eb 100644
--- a/charts/envoy-control-plane/templates/envoy.yaml
+++ b/charts/envoy-control-plane/templates/envoy.yaml
@@ -46,7 +46,7 @@ spec:
             exec:
               # gracefully drain all connection
               command: ["/bin/sh", "-c", "cli -drainEnvoy; sleep 5s; pkill -SIGTERM envoy"]
-        image: {{ .Values.envoy.registry.image | quote }}
+        image: {{ tpl .Values.envoy.registry.image . | quote }}
         imagePullPolicy: {{ .Values.envoy.registry.imagePullPolicy | quote }}
         args:
         - /bin/sh
diff --git a/charts/envoy-control-plane/templates/testPods.yaml b/charts/envoy-control-plane/templates/testPods.yaml
index ab06422..2a7545e 100644
--- a/charts/envoy-control-plane/templates/testPods.yaml
+++ b/charts/envoy-control-plane/templates/testPods.yaml
@@ -63,12 +63,16 @@ spec:
           name: test-pod-config
       containers:
       - name: test-001
-        image: envoyproxy/envoy:v1.21.0
-        imagePullPolicy: IfNotPresent
+        image: paskalmaksim/envoy-docker-image:latest
+        imagePullPolicy: Always
         resources:
           limits:
             cpu: 10m
             memory: 100Mi
+        command:
+        - /usr/local/bin/envoy
+        - --config-path /etc/envoy/envoy.yaml
+        - --log-level warn
         # stop container after 30 sec
         # lifecycle:
         #   preStop:
@@ -108,12 +112,16 @@ spec:
           name: test-pod-config
       containers:
       - name: test-002
-        image: envoyproxy/envoy:v1.21.0
-        imagePullPolicy: IfNotPresent
+        image: paskalmaksim/envoy-docker-image:latest
+        imagePullPolicy: Always
         resources:
           limits:
             cpu: 10m
             memory: 100Mi
+        command:
+        - /usr/local/bin/envoy
+        - --config-path /etc/envoy/envoy.yaml
+        - --log-level warn
         # stop container after 30 sec
         # lifecycle:
         #   preStop:
diff --git a/charts/envoy-control-plane/values.yaml b/charts/envoy-control-plane/values.yaml
index 60c87c4..e2da333 100644
--- a/charts/envoy-control-plane/values.yaml
+++ b/charts/envoy-control-plane/values.yaml
@@ -105,12 +105,12 @@ certificates:
     -----END PRIVATE KEY-----
 
 registry:
-  image: paskalmaksim/envoy-control-plane:v0.3.5
+  image: paskalmaksim/envoy-control-plane:{{ .Chart.AppVersion }}
   imagePullPolicy: IfNotPresent
 
 envoy:
   registry:
-    image: paskalmaksim/envoy-docker-image:v0.3.5
+    image: paskalmaksim/envoy-docker-image:{{ .Chart.AppVersion }}
     imagePullPolicy: IfNotPresent
 
 service:
diff --git a/examples/zone-aware/docker-compose.yaml b/examples/zone-aware/docker-compose.yaml
index 4eb16ab..ba07514 100644
--- a/examples/zone-aware/docker-compose.yaml
+++ b/examples/zone-aware/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
   envoy:
-    image: envoyproxy/envoy:v1.21.0
+    image: paskalmaksim/envoy-docker-image:latest
     ports:
     - 8000:8000
     - 8001:8001