From 7135a2e90dca2f5e814d5d92f8e1b335622e4e2d Mon Sep 17 00:00:00 2001 From: Aleksandr Beshkenadze Date: Fri, 7 May 2021 21:14:22 +0300 Subject: [PATCH] Do not create SysLog when unifiedService is disabled (#887) --- charts/stable/unifi/Chart.yaml | 2 +- charts/stable/unifi/README.md | 9 ++++++++- charts/stable/unifi/README.md.gotmpl | 1 + charts/stable/unifi/README_CHANGELOG.md.gotmpl | 7 +++++++ charts/stable/unifi/templates/syslog-svc.yaml | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/charts/stable/unifi/Chart.yaml b/charts/stable/unifi/Chart.yaml index e85a126c..0ce0d73b 100644 --- a/charts/stable/unifi/Chart.yaml +++ b/charts/stable/unifi/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 6.0.45 description: Ubiquiti Network's Unifi Controller name: unifi -version: 2.0.1 +version: 2.0.2 keywords: - ubiquiti - unifi diff --git a/charts/stable/unifi/README.md b/charts/stable/unifi/README.md index 6aa7af96..27d51ad0 100644 --- a/charts/stable/unifi/README.md +++ b/charts/stable/unifi/README.md @@ -1,6 +1,6 @@ # unifi -![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![AppVersion: 6.0.45](https://img.shields.io/badge/AppVersion-6.0.45-informational?style=flat-square) +![Version: 2.0.2](https://img.shields.io/badge/Version-2.0.2-informational?style=flat-square) ![AppVersion: 6.0.45](https://img.shields.io/badge/AppVersion-6.0.45-informational?style=flat-square) Ubiquiti Network's Unifi Controller @@ -216,6 +216,12 @@ All notable changes to this application Helm chart will be documented in this fi The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +### [2.0.2] + +#### Fixed + +- Separate syslog service is only created when enabled and unifiedService is disabled. + ### [2.0.1] #### Added @@ -244,6 +250,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - N/A +[2.0.2]: #2.0.2 [2.0.1]: #2.0.1 [1.5.3]: #1.5.3 diff --git a/charts/stable/unifi/README.md.gotmpl b/charts/stable/unifi/README.md.gotmpl index c21f99b3..358abe31 100644 --- a/charts/stable/unifi/README.md.gotmpl +++ b/charts/stable/unifi/README.md.gotmpl @@ -143,3 +143,4 @@ helm install {{ template "chart.name" . }} {{ template "custom.helm.path" . }} - {{ template "custom.support" . }} {{ template "helm-docs.versionFooter" . }} +{{ "" }} diff --git a/charts/stable/unifi/README_CHANGELOG.md.gotmpl b/charts/stable/unifi/README_CHANGELOG.md.gotmpl index efedba41..e08b0992 100644 --- a/charts/stable/unifi/README_CHANGELOG.md.gotmpl +++ b/charts/stable/unifi/README_CHANGELOG.md.gotmpl @@ -9,6 +9,12 @@ All notable changes to this application Helm chart will be documented in this fi The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +### [2.0.2] + +#### Fixed + +- Separate syslog service is only created when enabled and unifiedService is disabled. + ### [2.0.1] #### Added @@ -37,6 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - N/A +[2.0.2]: #2.0.2 [2.0.1]: #2.0.1 [1.5.3]: #1.5.3 {{- end -}} diff --git a/charts/stable/unifi/templates/syslog-svc.yaml b/charts/stable/unifi/templates/syslog-svc.yaml index 460d7fed..d37e404e 100644 --- a/charts/stable/unifi/templates/syslog-svc.yaml +++ b/charts/stable/unifi/templates/syslog-svc.yaml @@ -1,4 +1,4 @@ -{{ if not .Values.unifiedService.enabled }} +{{ if and (not (.Values.unifiedService.enabled)) .Values.syslogService.enabled }} apiVersion: v1 kind: Service metadata: