From 614fda9b7d284862bd84a1eab62ba8144f798199 Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Fri, 14 Jul 2023 10:37:10 +0200
Subject: [PATCH] fix: Adhere to naming convention in values.yaml

---
 .drone.yml                                   | 14 +++++++-------
 charts/json-server/templates/configmap.yaml  |  2 +-
 charts/json-server/templates/deployment.yaml |  4 ++--
 charts/json-server/values.yaml               |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c394c19..7651f9b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -48,7 +48,7 @@ steps:
   pull: always
   commands:
   - |
-    export IMAGE_TAG=$(cat .version 2> /dev/null) && [ -n "$IMAGE_TAG" ] || (echo 'No release tag - exiting'; exit 0)
+    export VALID_TAG=$(cat .version 2> /dev/null) && [ -n "$VALID_TAG" ] || (echo 'No release tag - exiting'; exit 0)
   - |
     wget https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 -qO /bin/jq
     chmod +x /bin/jq
@@ -59,7 +59,7 @@ steps:
       --dockerfile=Dockerfile \
       --context=dir://. \
       --destination=bv11-cr01.bessems.eu/library/json-server:latest \
-      --destination=bv11-cr01.bessems.eu/library/json-server:$IMAGE_TAG
+      --destination=bv11-cr01.bessems.eu/library/json-server:$VALID_TAG
   environment:
     HARBOR_USERNAME:
       from_secret: harbor_username
@@ -73,7 +73,7 @@ steps:
   pull: always
   commands:
   - |
-    export IMAGE_TAG=$(cat .version 2> /dev/null) && [ -n "$IMAGE_TAG" ] || (echo 'No release tag - exiting'; exit 0)
+    export VALID_TAG=$(cat .version 2> /dev/null) && [ -n "$VALID_TAG" ] || (echo 'No release tag - exiting'; exit 0)
   - |
     wget https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 -qO /bin/jq
     chmod +x /bin/jq
@@ -84,7 +84,7 @@ steps:
       --dockerfile=Dockerfile \
       --context=dir://. \
       --destination=docker.io/djpbessems/json-server:latest \
-      --destination=docker.io/djpbessems/json-server:$IMAGE_TAG
+      --destination=docker.io/djpbessems/json-server:$VALID_TAG
   environment:
     DOCKER_USERNAME:
       from_secret: docker_username
@@ -98,9 +98,9 @@ steps:
   pull: always
   commands:
   - |
-    export CHART_VERSION=$(cat .version 2> /dev/null) && [ -n "$CHART_VERSION" ] || (echo 'No release tag - exiting'; exit 0)
-    sed -i 's/{{ chart_version }}/'$CHART_VERSION'/g' charts/json-server/Chart.yaml
-    sed -i 's/tag: latest/tag: '$CHART_VERSION'/g' charts/json-server/values.yaml
+    export VALID_TAG=$(cat .version 2> /dev/null) && [ -n "$VALID_TAG" ] || (echo 'No release tag - exiting'; exit 0)
+    sed -i 's/{{ chart_version }}/'$VALID_TAG'/g' charts/json-server/Chart.yaml
+    sed -i 's/{{ image_tag }}/'$VALID_TAG'/g' charts/json-server/values.yaml
   - |
     helm package ./charts/json-server
   - |
diff --git a/charts/json-server/templates/configmap.yaml b/charts/json-server/templates/configmap.yaml
index edea948..e89b7b1 100644
--- a/charts/json-server/templates/configmap.yaml
+++ b/charts/json-server/templates/configmap.yaml
@@ -1,4 +1,4 @@
-{{- if not .Values.json-server.seedData.existingConfigMap }}
+{{- if not .Values.jsonServer.seedData.existingConfigMap }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/charts/json-server/templates/deployment.yaml b/charts/json-server/templates/deployment.yaml
index 0ae8df6..32a9e1e 100644
--- a/charts/json-server/templates/deployment.yaml
+++ b/charts/json-server/templates/deployment.yaml
@@ -29,8 +29,8 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.json-server.image.repository }}:{{ .Values.json-server.image.tag | default .Chart.AppVersion }}"
-          imagePullPolicy: {{ .Values.json-server.image.pullPolicy }}
+          image: "{{ .Values.jsonServer.image.repository }}:{{ .Values.jsonServer.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.jsonServer.image.pullPolicy }}
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}
diff --git a/charts/json-server/values.yaml b/charts/json-server/values.yaml
index 1d990c8..f9b5b31 100644
--- a/charts/json-server/values.yaml
+++ b/charts/json-server/values.yaml
@@ -1,6 +1,6 @@
 # Default values for json-server.
 
-json-server:
+jsonServer:
   seedData:
     # Not implemented yet
     # existingConfigMap: ""
@@ -10,7 +10,7 @@ json-server:
     repository: bv11-cr01.bessems.eu/library/json-server
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: latest
+    tag: {{ image_tag }}
 
 sidecar:
   image: