From 3c9fcf5af253a44b0f1f9882376ef1fd9de18250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Thu, 4 May 2023 16:43:06 +0200 Subject: [PATCH 1/4] axosyslog-collector: relax livenessProbe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- charts/axosyslog-collector/templates/daemonset.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/axosyslog-collector/templates/daemonset.yaml b/charts/axosyslog-collector/templates/daemonset.yaml index 613334f..34f4d4c 100644 --- 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 }} From ae6162f0e42029a095ce87ff5579b411c50a60f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Thu, 4 May 2023 16:43:46 +0200 Subject: [PATCH 2/4] axosyslog-collector: use "current" config version as a default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- charts/axosyslog-collector/templates/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/axosyslog-collector/templates/config.yaml b/charts/axosyslog-collector/templates/config.yaml index 38f7d3e..bc58d52 100644 --- 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 { From d35f436852cd3a252858f0a0e38cf2001e8f3542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Thu, 4 May 2023 16:46:06 +0200 Subject: [PATCH 3/4] axosyslog-collector: use nightly until v4.2 is released MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The healthcheck syslog-ng-ctl command is not released yet. Signed-off-by: László Várady --- charts/axosyslog-collector/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/axosyslog-collector/values.yaml b/charts/axosyslog-collector/values.yaml index de64ef4..2922a65 100644 --- 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: "" From 94646b8729658165df6fd8f157bc1471a95bb37f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Thu, 4 May 2023 16:47:31 +0200 Subject: [PATCH 4/4] axosyslog-collector: bump version to 0.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- charts/axosyslog-collector/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/axosyslog-collector/Chart.yaml b/charts/axosyslog-collector/Chart.yaml index ef33ad0..45a1e0b 100644 --- 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"