From 127cdea7f86b714c21750f638adc078e92876f77 Mon Sep 17 00:00:00 2001
From: Jimmy Ray <jimmyray@amazon.com>
Date: Wed, 19 May 2021 11:55:08 -0400
Subject: [PATCH] refactor chart

---
 .gitignore                                 |  1 +
 readonly-go-http/templates/deployment.yaml | 30 +++++++++++-----------
 readonly-go-http/templates/namespace.yaml  |  4 +--
 readonly-go-http/templates/service.yaml    | 14 +++++-----
 readonly-go-http/values.yaml               | 11 ++++----
 5 files changed, 31 insertions(+), 29 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7b18b55
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.deploy
diff --git a/readonly-go-http/templates/deployment.yaml b/readonly-go-http/templates/deployment.yaml
index 0e049b5..6836fb5 100644
--- a/readonly-go-http/templates/deployment.yaml
+++ b/readonly-go-http/templates/deployment.yaml
@@ -1,14 +1,14 @@
 apiVersion: apps/v1  
 kind: Deployment  
 metadata:  
-  name: {{deployment.name}} 
-  namespace: {{deployment.namespace}}
-  labels: {{deployment.labels}}
+  name: {{ .Values.deployment.name }} 
+  namespace: {{ .Values.deployment.namespace }}
+  labels: {{ .Values.deployment.labels }}
 spec: 
-  revisionHistoryLimit: {{deployment.revisionHistoryLimit}}
+  revisionHistoryLimit: {{ .Values.deployment.revisionHistoryLimit }}
   selector:  
-    matchLabels: {{deployment.matchLabels}}
-  replicas: {{deployment.replicaCount}}
+    matchLabels: {{ .Values.deployment.matchLabels }}
+  replicas: {{ .Values.deployment.replicaCount }}
   strategy:  
     type: RollingUpdate  
     rollingUpdate:  
@@ -16,18 +16,18 @@ spec:
       maxUnavailable: 1 
   template:  
     metadata:  
-      labels: {{deployment.podTemplateLabels}}
+      labels: {{ .Values.deployment.podTemplateLabels }}
     spec:  
-      securityContext: {{deployment.podSecurityContext}}
+      securityContext: {{ .Values.deployment.podSecurityContext }}
       containers:  
-      - name: {{deployment.containerName}} 
-        image: {{deployment.image.repository}}:{{deployment.image.tag}}
+      - name: {{ .Values.deployment.containerName }} 
+        image: {{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag }}
         imagePullPolicy: IfNotPresent
-        securityContext: {{deployment.securityContext}}
-        resources: {{deployment.resource}} 
-        readinessProbe: {{deployment.readinessProbe}} 
-        livenessProbe: {{deployment.livenessProbe}}
-        ports: {{deployment.ports}}
+        securityContext: {{ .Values.deployment.securityContext }}
+        resources: {{ .Values.deployment.resource }} 
+        readinessProbe: {{ .Values.readinessProbe }} 
+        livenessProbe: {{ .Values.deployment.livenessProbe }}
+        ports: {{ .Values.deployment.ports }}
         volumeMounts:
           - mountPath: /tmp
             name: tmp
diff --git a/readonly-go-http/templates/namespace.yaml b/readonly-go-http/templates/namespace.yaml
index 07a8454..db35a4f 100644
--- a/readonly-go-http/templates/namespace.yaml
+++ b/readonly-go-http/templates/namespace.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-name: {{namespace.name}}
-labels: {{namespace.labels}}
\ No newline at end of file
+  name: {{ .Values.namespace.name }}
+  labels: {{ .Values.namespace.labels }}
\ No newline at end of file
diff --git a/readonly-go-http/templates/service.yaml b/readonly-go-http/templates/service.yaml
index 2859835..6e80ceb 100644
--- a/readonly-go-http/templates/service.yaml
+++ b/readonly-go-http/templates/service.yaml
@@ -1,15 +1,15 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{service.name}}
-  namespace: {{service.namespace}}
-  labels: {{service.labels}}
+  name: {{ .Values.service.name }}
+  namespace: {{ .Values.service.namespace }}
+  labels: {{ .Values.service.labels }}
 spec:
   ports:
-    - port: {{service.port}}
-      targetPort: {{service.targetPort}}
+    - port: {{ .Values.service.port }}
+      targetPort: {{ .Values.service.targetPort }}
       protocol: TCP
       name: http
-  type: {{service.type}}
-  selector: {{service.selector}}
+  type: {{ .Values.service.type }}
+  selector: {{ .Values.service.selector }}
   
\ No newline at end of file
diff --git a/readonly-go-http/values.yaml b/readonly-go-http/values.yaml
index 6697fe1..4ca6f4b 100644
--- a/readonly-go-http/values.yaml
+++ b/readonly-go-http/values.yaml
@@ -5,21 +5,22 @@ namespace:
 
 service:
   name: readonly
+  namespace: readonly
   type: LoadBalancer
   port: 80
   targetPort: 8080
-  labels: {owner: "jimmy",env: "dev",app: "readonly"}
-  selector: {"app","readonly"}
+  labels: {owner: "jimmy", env: "dev", app: "readonly"}
+  selector: {app: "readonly"}
 
 deployment:
   name: readonly
   namespace: readonly
-  labels: {owner: "jimmy",env: "dev",app: "readonly"}
+  labels: {owner: "jimmy", env: "dev", app: "readonly"}
   matchLabels: {app: "readonly"}
   revisionHistoryLimit: 3
   podSecurityContext: {fsGroup: "2000"}
   replicaCount: 3
-  podTemplateLabels: {owner: "jimmy",env: "dev",app: "readonly"}
+  podTemplateLabels: {owner: "jimmy", env: "dev", app: "readonly"}
   containerName: readonly
   image:
     repository: public.ecr.aws/r2l1x4g2/go-http-server
@@ -55,7 +56,7 @@ deployment:
   #     port: 8080
   #   initialDelaySeconds: 15
   #   periodSeconds: 20
-  ports: [containerPort: 8080]
+  ports: {containerPort: 8080}
   # ports:  
   # - containerPort: 8080