Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Rebased] Feature/generic ssl #163

Merged
merged 6 commits into from
Aug 26, 2019
Merged

[Rebased] Feature/generic ssl #163

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
161bd7a
add changes for making ssl option generic
rajinator Aug 22, 2019
90be667
requested changes for if statement
rajinator Aug 23, 2019
167e775
fix yaml
rajinator Aug 23, 2019
ea25888
commenting out section like the suggestion
rajinator Aug 23, 2019
e831ee9
using enabled function, for line 13 in secret.yaml to not cause errors
rajinator Aug 23, 2019
92aa474
Merge branch 'develop' into feature/generic-ssl
PrasadG193 Aug 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions helm/botkube/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
volumeMounts:
- name: config-volume
mountPath: "/config"
{{- if ne .Values.config.communications.mattermost.cert "None" }}
{{- if ne .Values.config.ssl.cert "None" }}
bhavin192 marked this conversation as resolved.
Show resolved Hide resolved
- name: certs
mountPath: "/etc/ssl/certs"
{{ end }}
Expand All @@ -52,7 +52,7 @@ spec:
- name: config-volume
configMap:
name: {{ include "botkube.fullname" . }}-configmap
{{- if ne .Values.config.communications.mattermost.cert "None" }}
{{- if ne .Values.config.ssl.cert "None" }}
bhavin192 marked this conversation as resolved.
Show resolved Hide resolved
- name: certs
secret:
secretName: {{ include "botkube.fullname" . }}-secret
Expand Down
4 changes: 2 additions & 2 deletions helm/botkube/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if ne .Values.config.communications.mattermost.cert "None" }}
{{- if ne .Values.config.ssl.cert "None" }}
bhavin192 marked this conversation as resolved.
Show resolved Hide resolved

apiVersion: v1
kind: Secret
Expand All @@ -10,6 +10,6 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
data:
ca-certificates.crt: {{ .Files.Get (printf "%s" .Values.config.communications.mattermost.cert) | b64enc }}
ca-certificates.crt: {{ .Files.Get (printf "%s" .Values.config.ssl.cert) | b64enc }}

{{ end }}
4 changes: 3 additions & 1 deletion helm/botkube/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ config:
# about the best practices for the created resource
recommendations: true

ssl: # For using custom SSL certificates
bhavin192 marked this conversation as resolved.
Show resolved Hide resolved
cert: None # SSL Certificate file. Leave it None for http connection. e.g certs/my-cert.crt

# Channels configuration
communications:
# Settings for Slack
Expand All @@ -208,7 +211,6 @@ config:
mattermost:
enabled: false
url: 'MATTERMOST_SERVER_URL' # URL where Mattermost is running. e.g https://example.com:9243
cert: None # SSL Certificate file. Leave it None for http connection. e.g certs/my-cert.crt
token: 'MATTERMOST_TOKEN' # Personal Access token generated by BotKube user
team: 'MATTERMOST_TEAM' # Mattermost Team to configure with BotKube
channel: 'MATTERMOST_CHANNEL' # Mattermost Channel for receiving BotKube alerts
Expand Down