From 448e768d53fbcc8e6ae0b2cee6c5916b0f9391ef Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Wed, 25 Aug 2021 16:02:21 +0200
Subject: [PATCH] fix: various minor tweaks and updates

---
 .../device-plugins/fuse-device-plugin.yaml    |  2 +-
 charts/kubezero-logging/values.yaml           |  2 +-
 .../templates/mariadb/istio-service.yaml      |  2 +-
 charts/kubezero-storage/Chart.yaml            |  2 +-
 cliff.toml                                    | 53 +++++++++++++++++++
 scripts/publish.sh                            |  2 +
 scripts/upgrade_120.sh                        |  1 +
 7 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 cliff.toml

diff --git a/charts/kubeadm/templates/device-plugins/fuse-device-plugin.yaml b/charts/kubeadm/templates/device-plugins/fuse-device-plugin.yaml
index c5a40e87..b63e7749 100644
--- a/charts/kubeadm/templates/device-plugins/fuse-device-plugin.yaml
+++ b/charts/kubeadm/templates/device-plugins/fuse-device-plugin.yaml
@@ -14,7 +14,7 @@ spec:
     spec:
       hostNetwork: true
       containers:
-      - image: public.ecr.aws/zero-downtime/fuse-device-plugin:v1.0
+      - image: public.ecr.aws/zero-downtime/fuse-device-plugin:v1.0-r1
         # imagePullPolicy: Always
         name: fuse-device-plugin
         securityContext:
diff --git a/charts/kubezero-logging/values.yaml b/charts/kubezero-logging/values.yaml
index 7f600a0a..f10ec228 100644
--- a/charts/kubezero-logging/values.yaml
+++ b/charts/kubezero-logging/values.yaml
@@ -210,7 +210,7 @@ fluentd:
             flush_thread_count 1
             flush_interval 30s
 
-            chunk_limit_size 8MB
+            chunk_limit_size 4MB
             total_limit_size 2GB
 
             flush_at_shutdown true
diff --git a/charts/kubezero-sql/templates/mariadb/istio-service.yaml b/charts/kubezero-sql/templates/mariadb/istio-service.yaml
index d3464911..2ecbbc04 100644
--- a/charts/kubezero-sql/templates/mariadb/istio-service.yaml
+++ b/charts/kubezero-sql/templates/mariadb/istio-service.yaml
@@ -2,7 +2,7 @@
 apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
-  name: mariadb
+  name: {{ template "kubezero-lib.fullname" $ }}-mariadb
   namespace: {{ .Release.Namespace }}
   labels:
 {{ include "kubezero-lib.labels" . | indent 4 }}
diff --git a/charts/kubezero-storage/Chart.yaml b/charts/kubezero-storage/Chart.yaml
index 173cf008..10de225d 100644
--- a/charts/kubezero-storage/Chart.yaml
+++ b/charts/kubezero-storage/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: kubezero-storage
 description: KubeZero umbrella chart for all things storage, eg. openEBS
 type: application
-version: 0.1.1
+version: 0.1.2
 home: https://kubezero.com
 icon: https://cdn.zero-downtime.net/assets/kubezero/logo-small-64.png
 keywords:
diff --git a/cliff.toml b/cliff.toml
new file mode 100644
index 00000000..4b86cd22
--- /dev/null
+++ b/cliff.toml
@@ -0,0 +1,53 @@
+# configuration file for git-cliff (0.1.0)
+
+[changelog]
+# changelog header
+header = """
+# Changelog
+All notable changes to this project will be documented in this file.\n
+"""
+# template for the changelog body
+# https://tera.netlify.app/docs/#introduction
+body = """
+{% if version %}\
+    ## [{{ version | replace(from="v", to="") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    ## [unreleased]
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {{ commit.message | upper_first }}\
+    {% endfor %}
+{% endfor %}\n
+"""
+# remove the leading and trailing whitespaces from the template
+trim = true
+# changelog footer
+footer = """
+<!-- generated by git-cliff -->
+"""
+
+[git]
+# allow only conventional commits
+# https://www.conventionalcommits.org
+conventional_commits = true
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^feat*", group = "Features"},
+    { message = "^fix*", group = "Bug Fixes"},
+    { message = "^doc*", group = "Documentation"},
+    { message = "^perf*", group = "Performance"},
+    { message = "^refactor*", group = "Refactor"},
+    { message = "^style*", group = "Styling"},
+    { message = "^test*", group = "Testing"},
+    { message = "^chore\\(release\\): prepare for*", skip = true},
+    { message = "^chore*", group = "Miscellaneous Tasks"},
+    { body = ".*security", group = "Security"},
+]
+# filter out the commits that are not matched by commit parsers
+filter_commits = false
+# glob pattern for matching git tags
+tag_pattern = "v[0-9]*"
+# regex for skipping tags
+skip_tags = "v0.1.0-beta.1"
diff --git a/scripts/publish.sh b/scripts/publish.sh
index b0f4ae42..ea7f16bc 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -45,6 +45,8 @@ fi
 
 cd $TMPDIR/repo
 
+# read
+
 helm repo index .
 git status
 
diff --git a/scripts/upgrade_120.sh b/scripts/upgrade_120.sh
index a4dcb30f..f0a5cc83 100755
--- a/scripts/upgrade_120.sh
+++ b/scripts/upgrade_120.sh
@@ -115,4 +115,5 @@ EOF
     kubectl apply -f _job.yaml
     kubectl wait -n kube-system --timeout 300s --for=condition=complete job/kubezero-upgrade
     kubectl delete -f _job.yaml
+    rm -f _job.yaml
 done