fix secrets, add statuspage

Author: minrk

helm-chart/minikube.yaml

@@ -13,4 +13,5 @@ nbviewer:
   - "--logging=debug"
 
 memcached:
-  replicas: 1
+  replicaCount: 1
+  pdbMinAvailable: 0

helm-chart/nbviewer/templates/deployment.yaml

@@ -3,11 +3,13 @@ kind: Deployment
 metadata:
   name: {{ template "nbviewer.fullname" . }}
   labels:
+    component: nbviewer
     {{- include "nbviewer.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicas }}
   selector:
     matchLabels:
+      component: nbviewer
       {{- include "nbviewer.matchLabels" . | nindent 6 }}
   {{- if .Values.deploymentStrategy }}
   strategy:
@@ -16,6 +18,7 @@ spec:
   template:
     metadata:
       labels:
+        component: nbviewer
         {{- include "nbviewer.matchLabels" . | nindent 8 }}
       annotations:
         # This lets us autorestart when the secret changes!
@@ -28,7 +31,7 @@ spec:
       volumes:
         - name: secret
           secret:
-            secretName: {{ template "nbviewer.fullname" . }}-secret
+            secretName: {{ template "nbviewer.fullname" . }}
         {{- if .Values.extraVolumes }}
         {{- .Values.extraVolumes | toYaml | trimSuffix "\n" | nindent 8 }}
         {{- end }}
@@ -81,21 +84,21 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: {{ template "nbviewer.fullname" . }}
-                  key: github.clientId
+                  key: github-clientId
             {{- end }}
             {{- if .Values.github.clientSecret }}
             - name: GITHUB_OAUTH_SECRET
               valueFrom:
                 secretKeyRef:
                   name: {{ template "nbviewer.fullname" . }}
-                  key: github.client-secret
+                  key: github-clientSecret
             {{- end }}
             {{- if .Values.github.accessToken }}
             - name: GITHUB_API_TOKEN
               valueFrom:
                 secretKeyRef:
                   name: {{ template "nbviewer.fullname" . }}
-                  key: github.accessToken
+                  key: github-accessToken
             {{- end }}
             - name: MEMCACHIER_SERVERS
               value: {{ .Release.Name }}-memcached:11211

helm-chart/nbviewer/templates/secret.yaml

@@ -1,11 +1,12 @@
 kind: Secret
 apiVersion: v1
 metadata:
-  name: {{ template "nbviewer.fullname" . }}-secret
+  name: {{ template "nbviewer.fullname" . }}
   labels:
     {{- include "nbviewer.labels" . | nindent 4 }}
 type: Opaque
 data:
-  github-accessToken: {{ .Values.github.accessToken }}
-  github-clientId: {{ .Values.github.clientId }}
-  github-clientSecret: {{ .Values.github.clientSecret }}
+  github-accessToken: {{ .Values.github.accessToken | b64enc | quote }}
+  github-clientId: {{ .Values.github.clientId | b64enc | quote }}
+  github-clientSecret: {{ .Values.github.clientSecret | b64enc | quote }}
+  statuspage-apiKey: {{ .Values.statuspage.apiKey | b64enc | quote }}

helm-chart/nbviewer/templates/statuspage.yaml

@@ -0,0 +1,75 @@
+{{- if .Values.statuspage.enabled -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ template "nbviewer.fullname" . }}-statuspage
+  labels:
+    component: statuspage
+    {{- include "nbviewer.labels" . | nindent 4 }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      component: statuspage
+      {{- include "nbviewer.matchLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        component: statuspage
+        {{- include "nbviewer.matchLabels" . | nindent 8 }}
+      annotations:
+        # This lets us autorestart when the secret changes!
+        checksum/secret: {{ include (print .Template.BasePath "/secret.yaml") . | sha256sum }}
+        {{- if .Values.annotations }}
+        {{- .Values.annotations | toYaml | trimSuffix "\n" | nindent 8 }}
+        {{- end }}
+    spec:
+      nodeSelector: {{ toJson .Values.nodeSelector }}
+      volumes:
+        - name: secret
+          secret:
+            secretName: {{ template "nbviewer.fullname" . }}
+      containers:
+        - name: statuspage
+          image: {{ .Values.statuspage.image }}
+
+          resources:
+            {{- .Values.statuspage.resources | toYaml | trimSuffix "\n" | nindent 12 }}
+          {{- with .Values.imagePullPolicy }}
+          imagePullPolicy: {{ . }}
+          {{- end }}
+          env:
+            - name: PYTHONUNBUFFERED
+              value: "1"
+            {{- if .Values.github.clientId }}
+            - name: GITHUB_OAUTH_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "nbviewer.fullname" . }}
+                  key: github-clientId
+            {{- end }}
+            {{- if .Values.github.clientSecret }}
+            - name: GITHUB_OAUTH_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "nbviewer.fullname" . }}
+                  key: github-clientSecret
+            {{- end }}
+            {{- if .Values.github.accessToken }}
+            - name: GITHUB_API_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "nbviewer.fullname" . }}
+                  key: github-accessToken
+            {{- end }}
+            - name: STATUSPAGE_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ template "nbviewer.fullname" . }}
+                  key: statuspage-apiKey
+            - name: STATUSPAGE_PAGE_ID
+              value: {{ .Values.statuspage.pageId }}
+            - name: STATUSPAGE_METRIC_ID
+              value: {{ .Values.statuspage.metricId }}
+
+{{- end -}}

helm-chart/nbviewer/values.yaml

@@ -4,7 +4,7 @@ imagePullPolicy: null
 service: {}
 nodeSelector: null
 
-replicas: 2
+pdbMinAvailable: 2
 
 pdb:
   minAvailable: 1
@@ -45,9 +45,18 @@ nbviewer:
 
 memcached:
   AntiAffinity: soft
-  replicas: 2
+  replicaCount: 2
+  pdbMinAvailable: 1
 
 updateStrategy:
   rollingUpdate:
     maxSurge: 1
     maxUnavailable: 1
+
+statuspage:
+  enabled: false
+  image: jupyter/statuspage
+  resources: null
+  apiKey: ""
+  pageId: ""
+  metricId: ""