[stage-3] fix values for simple-app and atlantis

k8s/helm/simple-app/templates/NOTES.txt

@@ -1,6 +1,6 @@
 ---------------------------------------------------------
 
-Content of NOTES.txt appears after deploy.
-Deployed version {{ .Chart.AppVersion }}.
+Test application.
+Deployed version {{ .Values.image.tag | default .Chart.AppVersion }}.
 
 ---------------------------------------------------------

k8s/helm/simple-app/templates/deployment.yaml

@@ -7,7 +7,7 @@ metadata:
     service: application
   name: {{ .Chart.Name }}-{{ .Values.environment }}-application
 spec:
-  replicas: {{ .Values.application.replicasCount }}
+  replicas: {{ .Values.replicasCount }}
   selector:
     matchLabels:
       app: {{ .Chart.Name }}-{{ .Values.environment }}
@@ -19,12 +19,12 @@ spec:
         service: application
     spec:
       containers:
-        - image: {{ .Values.image.name }}:{{ .Chart.AppVersion }}
+        - image: {{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}
           imagePullPolicy: Always
           name: application
           ports:
             - name: web
               containerPort: 80
           resources:
-            {{- toYaml .Values.application.resources | nindent 12 }}
+            {{- toYaml .Values.resources | nindent 12 }}
       terminationGracePeriodSeconds: 30

k8s/helm/simple-app/values.yaml

@@ -2,13 +2,13 @@ environment: production
 
 image:
   name: dannecron/parcel-example-neko
+  tag:
 
-application:
-  replicasCount: 1
-  resources:
-    limits:
-      cpu: 200m
-      memory: 256Mi
-    requests:
-      cpu: 100m
-      memory: 128Mi
+replicasCount: 1
+resources:
+  limits:
+    cpu: 200m
+    memory: 256Mi
+  requests:
+    cpu: 100m
+    memory: 128Mi