example

Signed-off-by: Ashwani Singh <ashwani.singh@opstree.com>

charts/microservice/examples/config.conf

@@ -0,0 +1,2 @@
+name=opstree
+address=opstreesolution

charts/microservice/examples/deploy-nginx.yaml

@@ -1,9 +1,32 @@
+global:
+  namespace: "nginx"
+  fullnameOverride: "webapp"
+
 deployment:
   image:
     name: nginx
     tag: latest
     pullPolicy: IfNotPresent
-
-
-
-
+  livenessProbe: 
+    httpGet:
+      path: "/"
+      port: http
+  readinessProbe: 
+    httpGet:
+      path: "/"
+      port: http
+  resources:
+    requests:
+      memory: 100Mi
+      cpu: 100m
+    limits:
+      memory: 500Mi
+      cpu: 500m
+  volumes:
+    enabled: true
+    configMaps:
+      - name: webapp
+        mountPath: /webapp
+        data:
+          webapp.conf: |
+            name="opstree"

charts/microservice/templates/_capabilities.tpl

@@ -23,3 +23,14 @@ Return the appropriate apiVersion for Horizontal Pod Autoscaler.
 {{- end -}}
 {{- end -}}
 
+{{/*
+Return the appropriate apiVersion for deployment.
+*/}}
+{{- define "microservice.capabilities.deployment.apiVersion" -}}
+{{- $kubeVersion := include "microservice.capabilities.kubeVersion" . -}}
+{{- if and (not (empty $kubeVersion)) (semverCompare "<1.14-0" $kubeVersion) -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}

charts/microservice/templates/configmap.yaml

@@ -22,7 +22,7 @@ data:
   {{- range $file := $cm.files }}
   {{ $file.destination }}: |
 {{ $header | toString | indent 4 }}
-    {{ $root.Files.Get $file.source }}
+    {{ $root.Files.Get "$file.source" }}
   {{- end}}
   {{- end }}
 {{- end }}

charts/microservice/templates/hpa.yaml

@@ -8,21 +8,34 @@ metadata:
     {{- include "microservice.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
+    apiVersion: {{ include "microservice.capabilities.deployment.apiVersion" . }}
     kind: Deployment
-    name: {{ include "microservice.fullname" . }}
+    name: {{ include "microservice.fullname" . }}-app
   minReplicas: {{ .Values.hpa.minReplicas }}
   maxReplicas: {{ .Values.hpa.maxReplicas }}
   metrics:
-  {{- if .Values.hpa.targetCPUUtilizationPercentage }}
-  - type: Resource
-    resource:
-      name: cpu
-      targetAverageUtilization: {{ .Values.hpa.targetCPUUtilizationPercentage }}
-  {{- end }}
-  {{- if .Values.hpa.targetMemoryUtilizationPercentage }}
-  - type: Resource
-    resource:
-      name: memory
-      targetAverageUtilization: {{ .Values.hpa.targetMemoryUtilizationPercentage }}
-  {{- end }}
+    {{- if .Values.hpa.targetMemory }}
+    - type: Resource
+      resource:
+        name: memory
+        {{- if semverCompare "<1.23-0" (include "microservice.capabilities.kubeVersion" .) }}
+        targetAverageUtilization: {{ .Values.hpa.targetMemory }}
+        {{- else }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.hpa.targetMemory }}
+        {{- end }}
+    {{- end }}
+    {{- if .Values.hpa.targetCPU }}
+    - type: Resource
+      resource:
+        name: cpu
+        {{- if semverCompare "<1.23-0" (include "microservice.capabilities.kubeVersion" .) }}
+        targetAverageUtilization: {{ .Values.hpa.targetCPU }}
+        {{- else }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.hpa.targetCPU }}
+        {{- end }}
+    {{- end }}
 {{- end }}

charts/microservice/values.yaml

@@ -2,8 +2,8 @@
 global:
   namespace: "default"
   replicaCount: 1
-  nameOverride: "ashwani"
-  fullnameOverride: "ashwani"
+  nameOverride: ""
+  fullnameOverride: ""
   imagePullSecrets: []
   environment: {}
    # list of key: value
@@ -24,47 +24,46 @@ deployment:
   # Annotation for the Deployment
   annotations: {}
 
-  livenessProbe: {}
-  # livenessProbe: 
-  #   httpGet:
-  #     path: "/"
-  #     port: http
-  #   initialDelaySeconds: 25
-  #   periodSeconds: 10
-  #   timeoutSeconds: 5
-  #   successThreshold: 1
-  #   failureThreshold: 5
-
-  readinessProbe: {}
-  # readinessProbe:
-  #   httpGet:
-  #     path: "/"
-  #     port: http
-  #   initialDelaySeconds: 25
-  #   periodSeconds: 10
-  #   timeoutSeconds: 5
-  #   successThreshold: 1
-  #   failureThreshold: 5
-
-  environment:
-    ashwani: singh
-
-  # environment: {}
+  # livenessProbe: {}
+  livenessProbe: 
+    # httpGet:
+    #   path: "/"
+    #   port: http
+    initialDelaySeconds: 250
+    periodSeconds: 10
+    timeoutSeconds: 5
+    successThreshold: 1
+    failureThreshold: 5
+
+  # readinessProbe: {}
+  readinessProbe:
+    # httpGet:
+    #   path: "/"
+    #   port: http
+    initialDelaySeconds: 30
+    periodSeconds: 10
+    timeoutSeconds: 5
+    successThreshold: 1
+    failureThreshold: 5
+
+  environment: {}
   #   VAR1: value1
 
   resources: {}
 
   # resources:
   #   requests:
-  #     memory: 100m
+  #     memory: 100Mi
   #     cpu: 100m
   #   limits:
-  #     memory: 100m
+  #     memory: 100Mi
   #     cpu: 100m
 
   # Additional volumes on the output Deployment definition.
   volumes:
-    enabled: false
+    enabled: true
+    pvc: 
+      enabled: false
     # pvc:
     #   enabled: false
     #   existing_claim: false
@@ -79,7 +78,7 @@ deployment:
     #   line1
     #   line2
 
-    # configMaps:
+    configMaps:
     #   - name: test
     #     mountPath: /test
     #     data:
@@ -118,8 +117,8 @@ hpa:
   enabled: true
   minReplicas: 1
   maxReplicas: 1
-  targetCPUUtilizationPercentage: 80
-  targetMemoryUtilizationPercentage: 80
+  targetCPU: 80
+  targetMemory: 80
 
 service:
   type: ClusterIP
@@ -129,7 +128,7 @@ service:
     name: http
 
 serviceAccount:
-  create: true
+  create: false
   # Automatically mount a ServiceAccount's API credentials?
   automount: true
   # Annotations to add to the service account