Merge pull request #95 from helxplatform/develop

Develop to master - fix to clean ambassador pod logs

Author: pj-linebaugh

Chart.yaml

@@ -12,7 +12,7 @@ description: A Helm chart for deploying HeLx to Kubernetes.
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 4.4.2
+version: 4.4.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

README.md

@@ -2,7 +2,7 @@
 
 A Helm chart for deploying HeLx to Kubernetes.
 
-![Version: 4.4.2](https://img.shields.io/badge/Version-4.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.6.4](https://img.shields.io/badge/AppVersion-3.6.4-informational?style=flat-square)
+![Version: 4.4.3](https://img.shields.io/badge/Version-4.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.6.4](https://img.shields.io/badge/AppVersion-3.6.4-informational?style=flat-square)
 
 HeLx puts the most advanced analytical scientific models at investigator’s finger tips using equally advanced cloud native, container orchestrated, distributed computing systems. HeLx can be applied in many domains. Its ability to empower researchers to leverage advanced analytical tools without installation or other infrastructure concerns has broad reaching benefits.
 

charts/ambassador/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: ambassador
-version: 0.2.1
+version: 0.2.2
 appVersion: 1.14.4

charts/ambassador/README.md

@@ -1,6 +1,6 @@
 # ambassador
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![AppVersion: 1.14.4](https://img.shields.io/badge/AppVersion-1.14.4-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![AppVersion: 1.14.4](https://img.shields.io/badge/AppVersion-1.14.4-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -15,6 +15,9 @@ A Helm chart for Kubernetes
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"docker.io/datawire/ambassador"` |  |
 | imagePullSecrets | list | `[]` |  |
+| logrotateImage.pullPolicy | string | `"IfNotPresent"` |  |
+| logrotateImage.repository | string | `"containers.renci.org/helxplatform/logrotate"` |  |
+| logrotateImage.tag | string | `"v0.0.1"` |  |
 | nameOverride | string | `""` |  |
 | replicaCount | int | `1` |  |
 | resources.limits.cpu | string | `"300m"` |  |

charts/ambassador/templates/deployment.yaml

@@ -64,6 +64,24 @@ spec:
         volumeMounts:
         - mountPath: /tmp/ambassador-pod-info
           name: ambassador-pod-info
+        - name: shared-tmp-volume
+          mountPath: /tmp
+      - name: logrotate
+        image: "{{ .Values.logrotateImage.repository }}:{{ .Values.logrotateImage.tag }}"
+        imagePullPolicy: {{ .Values.logrotateImage.pullPolicy }}
+        command:
+        - /bin/sh
+        - -c
+        - |
+          while true; do 
+            /usr/sbin/logrotate -s /tmp/logrotate.status /etc/logrotate.d/logrotate.conf; 
+            sleep 3600;
+          done
+        volumeMounts:
+        - name: logrotate-config-volume
+          mountPath: /etc/logrotate.d
+        - name: shared-tmp-volume
+          mountPath: /tmp
       restartPolicy: Always
       {{- if .Values.securityContext }}
       securityContext:
@@ -85,3 +103,8 @@ spec:
               fieldPath: metadata.labels
             path: labels
         name: ambassador-pod-info
+      - name: logrotate-config-volume
+        configMap:
+          name: logrotate-config
+      - name: shared-tmp-volume
+        emptyDir: {}

charts/ambassador/templates/logrotate-configmap.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: logrotate-config
+data:
+  logrotate.conf: |
+    /tmp/admin_access_log {
+      size 25M
+      copytruncate
+      rotate 5
+      compress
+      delaycompress
+      missingok
+      notifempty
+    }

charts/ambassador/values.yaml

@@ -10,6 +10,11 @@ image:
   # tag: 1.1.1
   pullPolicy: IfNotPresent
 
+logrotateImage:
+  repository: containers.renci.org/helxplatform/logrotate
+  tag: v0.0.1
+  pullPolicy: IfNotPresent
+
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""