Merge pull request #245 from gillesdemey/patch-1

adds NOTIFICATION_LEVEL environment variable
2018-08-02 09:56:32 +01:00 · 2018-08-02 09:56:32 +01:00 · 6f334dd773
parent 80e5059329 83ec109be0
commit 6f334dd773
8 changed files with 100 additions and 30 deletions
--- a/chart/keel/Chart.yaml
+++ b/chart/keel/Chart.yaml
@ -1,7 +1,7 @@
 apiVersion: v1
 name: keel
 description: Open source, tool for automating Kubernetes deployment updates. Keel is stateless, robust and lightweight.
-version: 0.6.0
+version: 0.6.1
 # Note that we use appVersion to get images tag, so make sure this is correct.
 appversion: 0.9.5
 keywords:
--- a/chart/keel/README.md
+++ b/chart/keel/README.md
@ -89,7 +89,7 @@ The following table lists has the main configurable parameters (polling, trigger
 | `slack.enabled`                   | Enable/disable Slack Notification      | `false`                                                   |
 | `slack.token`                     | Slack token                            |                                                           |
 | `slack.channel`                   | Slack channel                          |                                                           |
-| `slack.approvals_channel`         | Slack channel for approvals            |                                                           |
+| `slack.approvalsChannel`          | Slack channel for approvals            |                                                           |
 | `service.enable`                  | Enable/disable Keel service            | `false`                                                   |
 | `service.type`                    | Keel service type                      | `LoadBalancer`                                            |
 | `service.externalPort`            | Keel service port                      | `9300`                                                    |
@ -101,11 +101,12 @@ The following table lists has the main configurable parameters (polling, trigger
 | `hipchat.enabled`                 | Enable/disable hipchat integration     | `false`                                                   |
 | `hipchat.token`                   | Hipchat token                          |                                                           |
 | `hipchat.channel`                 | Hipchat channel                        |                                                           |
-| `hipchat.approvals_channel`       | Hipchat channel for approvals          |                                                           |
-| `hipchat.bot_name`                | Name of the Hipchat bot                |                                                           |
-| `hipchat.user_name`               | Hipchat username in Jabber format      |                                                           |
+| `hipchat.approvalsChannel`        | Hipchat channel for approvals          |                                                           |
+| `hipchat.botName`                 | Name of the Hipchat bot                |                                                           |
+| `hipchat.userName`                | Hipchat username in Jabber format      |                                                           |
 | `hipchat.password`                | Hipchat password for approvals user    |                                                           |
 | `googleApplicationCredentials`    | GCP Service account key configurable   |                                                           |
+| `notificationLevel`               | Keel notification level                | `info`                                                    |

 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.

--- a/chart/keel/templates/deployment.yaml
+++ b/chart/keel/templates/deployment.yaml
@ -83,10 +83,10 @@ spec:
            - name: SLACK_CHANNELS
              value: "{{ .Values.slack.channel }}"
            - name: SLACK_APPROVALS_CHANNEL
-              value: "{{ .Values.slack.approvals_channel }}"
+              value: "{{ .Values.slack.approvalsChannel }}"
  {{- if .Values.slack.bot_name }}
            - name: SLACK_BOT_NAME
-              value: "{{ .Values.slack.bot_name }}"
+              value: "{{ .Values.slack.botName }}"
  {{- end }}
 {{- end }}
 {{- if .Values.hipchat.enabled }}
@ -96,14 +96,16 @@ spec:
            - name: HIPCHAT_CHANNELS
              value: "{{ .Values.hipchat.channel }}"
            - name: HIPCHAT_APPROVALS_CHANNEL
-              value: "{{ .Values.hipchat.approvals_channel }}"
+              value: "{{ .Values.hipchat.approvalsChannel }}"
            - name: HIPCHAT_APPROVALS_BOT_NAME
-              value: "{{ .Values.hipchat.bot_name }}"
+              value: "{{ .Values.hipchat.botName }}"
            - name: HIPCHAT_APPROVALS_USER_NAME
-              value: "{{ .Values.hipchat.user_name }}"
+              value: "{{ .Values.hipchat.userName }}"
            - name: HIPCHAT_APPROVALS_PASSWORT
              value: "{{ .Values.hipchat.password }}"
 {{- end }}
+            - name: NOTIFICATION_LEVEL
+              value: "{{ .Values.notificationLevel }}"
 {{- if .Values.debug }}
            # Enable debug logging
            - name: DEBUG
@ -112,7 +114,7 @@ spec:
 {{- if .Values.insecure_registry }}
            # Enable insecure registries
            - name: INSECURE_REGISTRY
-              value: "{{ .Values.insecure_registry }}"
+              value: "{{ .Values.insecureRegistry }}"
 {{- end }}
 {{- if .Values.aws.region }}
            - name: AWS_REGION
--- a/chart/keel/values.yaml
+++ b/chart/keel/values.yaml
@ -4,11 +4,11 @@

 image:
  repository: keelhq/keel
-  # tag: 
+  # tag:
  pullPolicy: IfNotPresent

 # Enable insecure registries
-insecure_registry: false
+insecureRegistry: false

 # Polling is enabled by default,
 # you can disable it setting value below to false
@ -28,6 +28,9 @@ gcr:
  pubSub:
    enabled: false

+# Notification level (debug, info, success, warn, error, fatal)
+notificationLevel: info
+
 # Webhook Notification
 # Remote webhook endpoint for notification delivery
 webhook:
@ -38,19 +41,19 @@ webhook:
 # bot name (default keel) must exist!
 slack:
  enabled: false
-  bot_name: ""
+  botName: ""
  token: ""
  channel: ""
-  approvals_channel: ""
+  approvalsChannel: ""

 # Hipchat notification and approvals
 hipchat:
  enabled: false
  token: ""
  channel: ""
-  approvals_channel: ""
-  bot_name: ""
-  user_name: ""
+  approvalsChannel: ""
+  botName: ""
+  userName: ""
  password: ""

 mattermost:
--- a/deployment/deployment-norbac-whr-sidecar.yaml
+++ b/deployment/deployment-norbac-whr-sidecar.yaml
@ -15,7 +15,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller

@ -29,7 +29,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller
 spec:
@ -52,7 +52,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller
 spec:
@ -110,6 +110,8 @@ spec:
              value: ""
            - name: HIPCHAT_APPROVALS_PASSWORT
              value: ""
+            - name: NOTIFICATION_LEVEL
+              value: "info"
            # Enable insecure registries
            - name: INSECURE_REGISTRY
              value: "true"
@ -155,6 +157,20 @@ spec:
              memory: 64Mi
            

+---
+# Source: keel/templates/pod-disruption-budget.yaml
+
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: keel
+  namespace: keel
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      app: keel
+
 ---
 # Source: keel/templates/clusterrole.yaml

--- a/deployment/deployment-norbac.yaml
+++ b/deployment/deployment-norbac.yaml
@ -15,7 +15,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller

@ -29,7 +29,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller
 spec:
@ -52,7 +52,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller
 spec:
@ -110,6 +110,8 @@ spec:
              value: ""
            - name: HIPCHAT_APPROVALS_PASSWORT
              value: ""
+            - name: NOTIFICATION_LEVEL
+              value: "info"
            # Enable insecure registries
            - name: INSECURE_REGISTRY
              value: "true"
@ -155,6 +157,20 @@ spec:
              memory: 64Mi
            

+---
+# Source: keel/templates/pod-disruption-budget.yaml
+
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: keel
+  namespace: keel
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      app: keel
+
 ---
 # Source: keel/templates/clusterrole.yaml

--- a/deployment/deployment-rbac-whr-sidecar.yaml
+++ b/deployment/deployment-rbac-whr-sidecar.yaml
@ -15,7 +15,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller

@ -97,7 +97,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller
 spec:
@ -120,7 +120,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller
 spec:
@ -178,6 +178,8 @@ spec:
              value: ""
            - name: HIPCHAT_APPROVALS_PASSWORT
              value: ""
+            - name: NOTIFICATION_LEVEL
+              value: "info"
            # Enable insecure registries
            - name: INSECURE_REGISTRY
              value: "true"
@ -223,6 +225,20 @@ spec:
              memory: 64Mi
            

+---
+# Source: keel/templates/pod-disruption-budget.yaml
+
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: keel
+  namespace: keel
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      app: keel
+
 ---
 # Source: keel/templates/secrets-google.yaml

--- a/deployment/deployment-rbac.yaml
+++ b/deployment/deployment-rbac.yaml
@ -15,7 +15,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller

@ -97,7 +97,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller
 spec:
@ -120,7 +120,7 @@ metadata:
  namespace: keel
  labels:
    app: keel
-    chart: keel-0.2.1
+    chart: keel-0.6.1
    release: keel
    heritage: Tiller
 spec:
@ -178,6 +178,8 @@ spec:
              value: ""
            - name: HIPCHAT_APPROVALS_PASSWORT
              value: ""
+            - name: NOTIFICATION_LEVEL
+              value: "info"
            # Enable insecure registries
            - name: INSECURE_REGISTRY
              value: "true"
@ -223,6 +225,20 @@ spec:
              memory: 64Mi
            

+---
+# Source: keel/templates/pod-disruption-budget.yaml
+
+apiVersion: policy/v1beta1
+kind: PodDisruptionBudget
+metadata:
+  name: keel
+  namespace: keel
+spec:
+  maxUnavailable: 1
+  selector:
+    matchLabels:
+      app: keel
+
 ---
 # Source: keel/templates/secrets-google.yaml