Issue #6 : Add Namespace and Probes Configuration to Kubernetes Manifests

demo-extended/templates/deployment.yaml

@@ -2,10 +2,11 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .Values.name }}
+  namespace: {{ .Values.namespace }}
   labels:
     app: {{ .Values.name }}
 spec:
-  replicas: {{ (.Values.scaling).replicas | default 1 }}
+  replicas: {{ .Values.scaling.replicas }}
   selector:
     matchLabels:
       app: {{ .Values.name }}
@@ -17,32 +18,48 @@ spec:
       containers:
         - name: {{ .Values.name }}
           image: "{{ .Values.general.image }}:{{ .Values.general.version }}"
-          {{- if ((.Values.networking).expose) }}
+
+          {{- if .Values.networking.expose }}
           ports:
             - name: http
-              containerPort: {{ .Values.networking.port | default 80 }}
+              containerPort: {{ .Values.networking.port }}
               protocol: TCP
           {{- end }}
+
           env:
-          {{- if ((.Values.general).environment) }}
-          {{- range $key, $value := (.Values.general).environment }}
-            - name: {{ $key }}
-              value: {{ $value | quote }}
+          {{- if .Values.general.environment }}
+          {{- toYaml .Values.general.environment | indent 12 }}
           {{- end }}
-          {{- end }}
-          {{- if or ((.Values.scaling).resources).memory ((.Values.scaling).resources).cpu }}
+
           resources:
-            {{- if ((.Values.scaling).resources).memory }}
+            {{- if .Values.scaling.resources.memory }}
             limits:
-              memory: {{ ((.Values.scaling).resources).memory }}Gi
+              memory: "{{ .Values.scaling.resources.memory }}Gi"
             {{- end }}
-            {{- if or ((.Values.scaling).resources).memory ((.Values.scaling).resources).cpu }}
+            {{- if .Values.scaling.resources.cpu }}
             requests:
-              {{- if ((.Values.scaling).resources).cpu }}
-              cpu: {{ ((.Values.scaling).resources).cpu }}
-              {{- end }}
-              {{- if ((.Values.scaling).resources).memory }}
-              memory: {{ ((.Values.scaling).resources).memory }}Gi
-              {{- end }}
+              cpu: "{{ .Values.scaling.resources.cpu }}"
             {{- end }}
-          {{- end }}
+
+          readinessProbe:
+            httpGet:
+              path: {{ .Values.probes.readiness.path }}
+              port: http
+            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
+            failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
+
+          livenessProbe:
+            httpGet:
+              path: {{ .Values.probes.liveness.path }}
+              port: http
+            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
+
+          startupProbe:
+            httpGet:
+              path: {{ .Values.probes.startup.path }}
+              port: http
+            initialDelaySeconds: {{ .Values.probes.startup.initialDelaySeconds }}
+            periodSeconds: {{ .Values.probes.startup.periodSeconds }}
+            failureThreshold: {{ .Values.probes.startup.failureThreshold }}

demo-extended/templates/services.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .Values.name }}
+  namespace: {{ .Values.namespace }}
   labels:
     app: {{ .Values.name }}
 spec:
@@ -14,4 +15,4 @@ spec:
       name: http
   selector:
     app: {{ .Values.name }}
-  {{- end }}
+  {{- end }}

demo-extended/values.schema.json

@@ -5,6 +5,11 @@
       "title": "Name",
       "description": "Application name"
     },
+    "namespace": {
+      "type": "string",
+      "title": "Namespace",
+      "description": "Namespace for Application"
+    },
     "general": {
       "type": "object",
       "title": "General",
@@ -74,6 +79,79 @@
         "resources"
       ]
     },
+    "probes": {
+      "type": "object",
+      "title": "Probes",
+      "properties": {
+        "startup": {
+          "title": "Startup Probe",
+          "type": "object",
+          "properties": {
+            "path": {
+              "title": "Path for probe",
+              "type": "string"
+            },
+            "initialDelaySeconds": {
+              "title": "Initial Delay Seconds",
+              "type": "integer"
+            },
+            "periodSeconds": {
+              "title": "Period Seconds",
+              "type": "integer"
+            },
+            "failureThreshold": {
+              "title": "Failure Threshold",
+              "type": "integer"
+            }
+          }
+        },
+        "liveness": {
+          "title": "Liveness Probe",
+          "type": "object",
+          "properties": {
+            "path": {
+              "title": "Path for probe",
+              "type": "string"
+            },
+            "initialDelaySeconds": {
+              "title": "Initial Delay Seconds",
+              "type": "integer"
+            },
+            "periodSeconds": {
+              "title": "Period Seconds",
+              "type": "integer"
+            }
+          }
+        },
+        "readiness": {
+          "title": "Readiness Probe",
+          "type": "object",
+          "properties": {
+            "path": {
+              "title": "Path for probe",
+              "type": "string"
+            },
+            "initialDelaySeconds": {
+              "title": "Initial Delay Seconds",
+              "type": "integer"
+            },
+            "periodSeconds": {
+              "title": "Period Seconds",
+              "type": "integer"
+            },
+            "failureThreshold": {
+              "title": "Failure Threshold",
+              "type": "integer"
+            }
+          }
+        }
+      },
+      "order": [
+        "startup",
+        "liveness",
+        "readiness"
+      ]
+    },
     "networking": {
       "type": "object",
       "title": "Networking",
@@ -100,8 +178,10 @@
   ],
   "order": [
     "name",
+    "namespace",
     "general",
     "scaling",
+    "probes",
     "networking"
   ],
   "title": "Values",

demo-extended/values.yaml

@@ -1,5 +1,5 @@
 name: my-app
-
+namespace: default
 general:
   image: nginx
   version: 1.14.2
@@ -8,6 +8,25 @@ general:
 
 scaling:
   replicas: 3
+  resources:
+    cpu: 1
+    memory: 512
+
+probes:
+  startup:
+    path: "/"
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    failureThreshold: 3
+  liveness:
+    path: "/"
+    initialDelaySeconds: 10
+    periodSeconds: 20
+  readiness:
+    path: "/"
+    initialDelaySeconds: 5
+    periodSeconds: 10
+    failureThreshold: 3
 
 networking:
   expose: true