feat: supports github apps - sso (#17)

sentry-kubernetes · Feb 10, 2020 · 90829bd · 90829bd
1 parent da70618
commit 90829bd
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/sentry-db/Chart.yaml b/sentry-db/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sentry-db
 description: A Helm chart for Kubernetes
 type: application
-version: 0.7.0
+version: 0.8.0
 appVersion: 10.0.0
 dependencies:
   - name: redis

diff --git a/sentry/Chart.yaml b/sentry/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: sentry
 description: A Helm chart for Kubernetes
 type: application
-version: 0.7.0
+version: 0.8.0
 appVersion: 10.0.0
diff --git a/sentry/templates/configmap-sentry.yaml b/sentry/templates/configmap-sentry.yaml
@@ -35,10 +35,21 @@ data:
 
     {{ if .Values.github.appId }}
     github-app.id: {{ .Values.github.appId }}
+    {{ end }}
+    {{ if .Values.github.appName }}
     github-app.name: "{{ .Values.github.appName }}"
-    # github-app.webhook-secret: ""
-    # github-app.private-key: ""
+    {{ end }}
+    {{ if .Values.github.privateKey }}
+    github-app.private-key: |-
+      {{ .Values.github.privateKey | nindent 8 }}"
+    {{ end }}
+    {{ if .Values.github.webhookSecret }}
+    github-app.webhook-secret: "{{ .Values.github.webhookSecret }}"
+    {{ end }}
+    {{ if .Values.github.clientId }}
     github-app.client-id: "{{ .Values.github.clientId }}"
+    {{ end }}
+    {{ if .Values.github.clientSecret }}
     github-app.client-secret: "{{ .Values.github.clientSecret }}"
     {{ end }}
 
@@ -307,11 +318,8 @@ data:
     # GitHub Integration #
     #####################
 
-    GITHUB_APP_ID = '{{ .Values.github.appId }}'
-    GITHUB_API_SECRET = '{{ .Values.github.appSecret }}'
-    # GITHUB_APP_ID = 'YOUR_GITHUB_APP_ID'
-    # GITHUB_API_SECRET = 'YOUR_GITHUB_API_SECRET'
-    # GITHUB_EXTENDED_PERMISSIONS = ['repo']
+    GITHUB_APP_ID = '{{ .Values.githubSso.clientId }}'
+    GITHUB_API_SECRET = '{{ .Values.githubSso.clientSecret }}'
 
     #########################
     # Bitbucket Integration #

diff --git a/sentry/values.yaml b/sentry/values.yaml
@@ -159,12 +159,18 @@ service:
   # - 192.168.0.1
   # loadBalancerSourceRanges: []
 
-github: {}
+github: {} # https://github.com/settings/apps (Create a Github App)
 # github:
-#   appId:
-#   appName:
-#   clientId:
-#   clientSecret:
+#   appId: "xxxx"
+#   appName: MyAppName
+#   clientId: "xxxxx"
+#   clientSecret: "xxxxx"
+#   privateKey: "-----BEGIN RSA PRIVATE KEY-----\nMIIEpA" !!!! Don't forget a trailing \n
+#   webhookSecret:  "xxxxx`"
+
+githubSso: {} # https://github.com/settings/developers (Create a OAuth App)
+  # clientId: "xx"
+  # clientSecret: "xx"
 
 slack: {}
 # slack: