Merge pull request #17 from MrAnno/minor-fixes

Minor fixes
axoflow · May 4, 2023 · 210ac99 · 210ac99
2 parents 8f8790f + 94646b8
commit 210ac99
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/charts/axosyslog-collector/Chart.yaml b/charts/axosyslog-collector/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: axosyslog-collector
 description: AxoSyslog kubernetes log collector
 type: application
-version: 0.1.0
+version: 0.1.1
 appVersion: "4.1.1"
diff --git a/charts/axosyslog-collector/templates/config.yaml b/charts/axosyslog-collector/templates/config.yaml
@@ -9,7 +9,7 @@ data:
   syslog-ng.conf: {{ tpl (toYaml .Values.config.raw) . | indent 4 }}
 {{- else }}
   syslog-ng.conf: |
-    @version: {{ regexFind "^[0-9]+\\.[0-9]+" (.Values.config.version | default .Values.image.tag | default .Chart.AppVersion ) }}
+    @version: {{ regexFind "^[0-9]+\\.[0-9]+" .Values.config.version | default "current" }}
     @include "scl.conf"
 
     options {

diff --git a/charts/axosyslog-collector/templates/daemonset.yaml b/charts/axosyslog-collector/templates/daemonset.yaml
@@ -125,6 +125,10 @@ spec:
 {{ toYaml (.Values.extraVolumeMounts | default .Values.daemonset.extraVolumeMounts ) | indent 12 }}
           {{- end }}
           livenessProbe:
+            initialDelaySeconds: 5
+            periodSeconds: 30
+            timeoutSeconds: 5
+            failureThreshold: 3
             exec:
-              command: ["syslog-ng-ctl", "healthcheck", "--timeout", "1"]
+              command: ["syslog-ng-ctl", "healthcheck", "--timeout", "5"]
 {{- end }}
diff --git a/charts/axosyslog-collector/values.yaml b/charts/axosyslog-collector/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: ghcr.io/axoflow/axosyslog
   pullPolicy: IfNotPresent
-  tag: ""
+  tag: "nightly" # until releasing v4.2
 
 imagePullSecrets: []
 nameOverride: ""