Helm chart notifications (#222)

* Notifications should work without http proxy set Before this change when proxy was not set in config, sending notification resulted in notification error: E0728 16:44:53.027020 1 notifications.go:47] error reporting attack for v1.Deployment <NAME> to <URL> with message <MESSAGE> send request: http request: Post "<URL>": proxyconnect tcp: dial tcp :0: connect: connection refused * helm chart support for notifications * chore: fix whitespace trim in rbac template right trim resulted in `helm template ...` output: ``` ---apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding ``` * bump chart version * chore: add whitespace in debug config to match other lines Co-authored-by: Daniel Albuquerque <dmartinsalbuqu@expediagroup.com>
asobti · Jul 29, 2021 · 2144ca6 · 2144ca6
1 parent 3a31519
commit 2144ca6
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/helm/kubemonkey/Chart.yaml b/helm/kubemonkey/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: 0.4.0
 description: A Helm chart for Kubernetes
 name: kube-monkey
-version: 1.4.0
+version: 1.4.1
diff --git a/helm/kubemonkey/README.md b/helm/kubemonkey/README.md
@@ -111,6 +111,7 @@ $ helm get manifest my-release
 | `config.debug.enabled`                 | debug mode,need to be enabled to see debuging behaviour                                 | false                            |
 | `config.debug.schedule_immediate_kill` | immediate pod kill matching other rules apart from time                                 | false                            |
 | `config.notifications.enabled`         | enables reporting of attacks to an HTTP endpoint                                        | false                            |
+| `config.notifications.proxy`           | notifications proxy URL                                                                 |                                  |
 | `config.notifications.attacks`         | HTTP collector in the form (endpoint,message,headers) where attacks will be reported to |                                  |
 | `args.logLevel`                        | go log level                                                                            | 5                                |
 | `args.logDir`                          | log directory                                                                           | /var/log/kube-monkey             |

diff --git a/helm/kubemonkey/templates/configmap.yaml b/helm/kubemonkey/templates/configmap.yaml
@@ -17,6 +17,13 @@ data:
       {{- end }}
       time_zone = {{ .Values.config.timeZone | quote }}
       [debug]
-      enabled= {{ .Values.config.debug.enabled }}
-      schedule_immediate_kill= {{ .Values.config.debug.schedule_immediate_kill }}
+      enabled = {{ .Values.config.debug.enabled }}
+      schedule_immediate_kill = {{ .Values.config.debug.schedule_immediate_kill }}
+      [notifications]
+      enabled = {{ .Values.config.notifications.enabled }}
+      {{- if ne .Values.config.notifications.proxy "" }}
+      proxy = {{ .Values.config.notifications.proxy}}
+      {{- end }}
+      [notifications.attacks]
+{{ indent 6 .Values.config.notifications.attacks -}}
 
diff --git a/helm/kubemonkey/templates/rbac.yaml b/helm/kubemonkey/templates/rbac.yaml
@@ -12,7 +12,7 @@ metadata:
 
 ---
 
-{{- if .Values.rbac.enabled -}}
+{{- if .Values.rbac.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:

diff --git a/helm/kubemonkey/values.yaml b/helm/kubemonkey/values.yaml
@@ -29,6 +29,10 @@ config:
   debug:
    enabled: false # if you want to enable debugging and see how pods killed immediately set enabled and schedule_immediate_kill to true
    schedule_immediate_kill: false
+  notifications:
+   enabled: false
+   proxy: ""
+   attacks: ""
 
 args:
   logLevel: 5