Moved to emty dir, added configmap

Author: wlanboy

javahttpclient-chart/templates/configmap.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Values.deploymentName }}-config
+data:
+  application.properties: |
+    # Endpoints
+    management.endpoints.web.exposure.include=prometheus,health,info,metric
+    management.endpoint.health.show-details=always
+    # Buildinfo
+    spring.config.import=classpath:META-INF/build-info.properties
+    # Tracing
+    spring.sleuth.propagation.type=w3c,b3

javahttpclient-chart/templates/deployment.yaml

@@ -20,9 +20,26 @@ spec:
           ports:
             - containerPort: {{ .Values.service.targetPort }}
           volumeMounts:
+            - name: config-volume
+              mountPath: /app/application.properties
+              subPath: application.properties
             - name: tmp-volume
-              mountPath: {{ .Values.volume.mountPath }}
+              mountPath: /tmp
+          livenessProbe:
+            httpGet:
+              path: /actuator/health/liveness
+              port: {{ .Values.service.targetPort }}
+            initialDelaySeconds: 10
+            periodSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: {{ .Values.service.targetPort }}
+            initialDelaySeconds: 5
+            periodSeconds: 10
       volumes:
+        - name: config-volume
+          configMap:
+            name: {{ .Values.deploymentName }}-config
         - name: tmp-volume
-          persistentVolumeClaim:
-            claimName: {{ .Values.pvc.name }}
+          emptyDir: {}

javahttpclient-chart/templates/gateway.yaml

@@ -11,7 +11,9 @@ spec:
         name: https
         protocol: HTTPS
       hosts:
-        - {{ .Values.istio.host }}
+      {{- range .Values.hosts }}
+        - {{ . }}
+      {{- end }}
       tls:
         mode: SIMPLE
         credentialName: {{ .Values.istio.tls.secretName }}

javahttpclient-chart/templates/pvc.yaml

@@ -4,7 +4,9 @@ metadata:
   name: {{ .Values.deploymentname }}-vs
 spec:
   hosts:
-    - {{ .Values.istio.host }}
+  {{- range .Values.hosts }}
+    - {{ . }}
+  {{- end }}
   exportTo:
   - "."
   - istio-ingress

javahttpclient-chart/templates/virtualservice.yaml

@@ -13,21 +13,16 @@ service:
   port: 8080
   targetPort: 8080
 
-pvc:
-  enabled: true
-  name: javahttpclient-tmp-pvc
-  accessModes:
-    - ReadWriteOnce
-  storageClassName: ""
-  size: "100Mi"
-
 volume:
   mountPath: /tmp
 
+hosts: 
+  - javahttpclient.tp.lan
+  - javahttpclient.gmk.lan
+
 istio:
   gatewayName: javahttpclient-gw
   gatewayNamespace: "istio-ingress"
-  host: javahttpclient.tp.lan
   tls:
     enabled: true
     secretName: javahttpclient-tls
@@ -39,3 +34,4 @@ certManager:
     name: "local-ca-issuer"
   dnsNames:
     - javahttpclient.tp.lan
+    - javahttpclient.gmk.lan