Config documentation improvements (#65)

Author: pepakriz

README.md

@@ -93,3 +93,4 @@ GITLAB_AUTH_TOKEN="<token>" yarn run start
 | `AUTORUN_MANUAL_BLOCKING_JOBS` | `true` | It'll autorun manual blocking jobs before merge |
 | `SKIP_SQUASHING_LABEL` | `bot:skip-squash` | It'll skip squash when MR contains this label |
 | `HI_PRIORITY_LABEL` | `bot:hi-priority` | It'll put MR with this label to the beginning of the queue |
+| `SENTRY_DSN` | `` | It'll enable Sentry monitoring |

charts/gitlab-merger-bot/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: gitlab-merger-bot
-version: 1.2.2
+version: 1.2.3
 home: https://github.com/pepakriz/gitlab-merger-bot
 maintainers:
   - name: pepakriz

charts/gitlab-merger-bot/templates/deployment.yaml

@@ -45,6 +45,10 @@ spec:
           value: "{{ .Values.settings.ciCheckInterval }}"
         - name: MR_CHECK_INTERVAL
           value: "{{ .Values.settings.mrCheckInterval }}"
+        - name: REMOVE_BRANCH_AFTER_MERGE
+          value: "{{ .Values.settings.removeBranchAfterMerge }}"
+        - name: SQUASH_MERGE_REQUEST
+          value: "{{ .Values.settings.squashMergeRequest }}"
         - name: AUTORUN_MANUAL_BLOCKING_JOBS
           value: "{{ .Values.settings.autorunManualBlockingJobs }}"
         - name: SENTRY_DSN

charts/gitlab-merger-bot/values.yaml

@@ -26,6 +26,8 @@ settings:
   sentryDsn: ""
   ciCheckInterval: 10
   mrCheckInterval: 20
+  removeBranchAfterMerge: true
+  squashMergeRequest: true
   autorunManualBlockingJobs: true
   skipSquashingLabel: ""
   hiPriorityLabel: ""