diff --git a/stable/kube-slack/Chart.yaml b/stable/kube-slack/Chart.yaml index febedfd280..501a86e149 100644 --- a/stable/kube-slack/Chart.yaml +++ b/stable/kube-slack/Chart.yaml @@ -1,5 +1,5 @@ name: kube-slack -version: 0.4.0 +version: 0.4.1 appVersion: v3.6.0 apiVersion: v1 description: Chart for kube-slack, a monitoring service for Kubernetes diff --git a/stable/kube-slack/README.md b/stable/kube-slack/README.md index cd0ed9d24c..185a5e9925 100644 --- a/stable/kube-slack/README.md +++ b/stable/kube-slack/README.md @@ -24,7 +24,9 @@ $ helm delete my-release ## Configuration -All configuration parameters are listed in [`values.yaml`](values.yaml). It is required to set the `slackUrl` value. +All configuration parameters are listed in [`values.yaml`](values.yaml). + +The environment values passed to kube-slack can be described in `envVars` parameter. At a minimum, the `envVars.SLACK_URL` value must be set. ## RBAC By default the chart will install the recommended RBAC roles and rolebindings. diff --git a/stable/kube-slack/templates/configmap.yaml b/stable/kube-slack/templates/configmap.yaml new file mode 100644 index 0000000000..10b4af1076 --- /dev/null +++ b/stable/kube-slack/templates/configmap.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "kube-slack.fullname" . }} + labels: + app: {{ template "kube-slack.name" . }} + chart: {{ template "kube-slack.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: +{{ toYaml .Values.envVars | indent 2 }} diff --git a/stable/kube-slack/templates/deployment.yaml b/stable/kube-slack/templates/deployment.yaml index 08a6c5db54..6ddb5222e5 100644 --- a/stable/kube-slack/templates/deployment.yaml +++ b/stable/kube-slack/templates/deployment.yaml @@ -15,6 +15,8 @@ spec: release: {{ .Release.Name }} template: metadata: + annotations: + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} labels: app: {{ template "kube-slack.name" . }} release: {{ .Release.Name }} @@ -23,11 +25,9 @@ spec: - name: {{ .Chart.Name }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} - env: - - name: SLACK_URL - value: {{ .Values.slackUrl }} - - name: NOT_READY_MIN_TIME - value: {{ .Values.notReadyMinTime | quote }} + envFrom: + - configMapRef: + name: {{ template "kube-slack.fullname" . }} resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.rbac.create }} diff --git a/stable/kube-slack/values.yaml b/stable/kube-slack/values.yaml index e1ca78dcb7..6e36d7ac62 100644 --- a/stable/kube-slack/values.yaml +++ b/stable/kube-slack/values.yaml @@ -1,7 +1,9 @@ -## URL of your Incoming Webhook in Slack: -slackUrl: "" -## Time to wait after pod becomes not ready before notifying -notReadyMinTime: 60000 # in ms +## Environment values for the deployment +envVars: + ## URL of your Incoming Webhook in Slack: + SLACK_URL: "" + ## Time to wait after pod becomes not ready before notifying + NOT_READY_MIN_TIME: "60000" # in ms ## Configuration for the deployment: image: