diff --git a/Chart.lock b/Chart.lock index 4b01dcf..9d27aad 100644 --- a/Chart.lock +++ b/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: postgresql repository: https://kubernetes-charts.storage.googleapis.com/ - version: 8.2.1 + version: 8.6.1 - name: redis repository: https://kubernetes-charts.storage.googleapis.com/ - version: 10.4.0 -digest: sha256:6dab63cfbf6a2f363b12ff9cbf683697352acfaa438962ef827418e5e9e7af22 -generated: "2020-02-01T17:08:07.30147224-05:00" + version: 10.5.6 +digest: sha256:aafd1cd92ca5e8642bc7ff086c860d0e9725a8303de35d523281fad0d434376c +generated: "2020-03-07T17:06:09.749414627-05:00" diff --git a/Chart.yaml b/Chart.yaml index 7de0199..5c28f2a 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -22,10 +22,10 @@ appVersion: 1.0.0 dependencies: - name: postgresql - version: 8.2.1 + version: 8.6.1 repository: https://kubernetes-charts.storage.googleapis.com/ condition: postgresql.enabled - name: redis - version: 10.4.0 + version: 10.5.6 repository: https://kubernetes-charts.storage.googleapis.com/ - condition: redis.enabled \ No newline at end of file + condition: redis.enabled diff --git a/charts/postgresql-8.2.1.tgz b/charts/postgresql-8.2.1.tgz deleted file mode 100644 index fd2656e..0000000 Binary files a/charts/postgresql-8.2.1.tgz and /dev/null differ diff --git a/charts/postgresql-8.6.1.tgz b/charts/postgresql-8.6.1.tgz new file mode 100644 index 0000000..c1ee74e Binary files /dev/null and b/charts/postgresql-8.6.1.tgz differ diff --git a/charts/redis-10.4.0.tgz b/charts/redis-10.4.0.tgz deleted file mode 100644 index 5113f54..0000000 Binary files a/charts/redis-10.4.0.tgz and /dev/null differ diff --git a/charts/redis-10.5.6.tgz b/charts/redis-10.5.6.tgz new file mode 100644 index 0000000..f1e4ec4 Binary files /dev/null and b/charts/redis-10.5.6.tgz differ diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index e3cb6bd..c12e95b 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -96,7 +96,7 @@ Set redis host */}} {{- define "glitchtip.redis.host" -}} {{- if .Values.redis.enabled -}} -{{- template "glitchtip.redis.fullname" . -}}-master +{{- template "glitchtip.redis.fullname" . -}}-redis-master {{- else -}} {{- .Values.redis.host | quote -}} {{- end -}} @@ -109,4 +109,15 @@ Set redis url {{- if .Values.redis.enabled -}} redis://{{- template "glitchtip.redis.password" -}}{{- template "glitchtip.redis.fullname" . -}}-master {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} + +{{/* +Set redis port +*/}} +{{- define "glitchtip.redis.port" -}} +{{- if .Values.redis.enabled -}} + "6379" +{{- else -}} +{{- default "6379" .Values.redis.port | quote -}} +{{- end -}} +{{- end -}} diff --git a/templates/configmap.yaml b/templates/configmap.yaml new file mode 100644 index 0000000..fe76fc1 --- /dev/null +++ b/templates/configmap.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "glitchtip.fullname" . }} + labels: + {{- include "glitchtip.labels" . | nindent 4 }} + annotations: + "helm.sh/hook-weight": "-1" +data: +{{- range $k, $v := .Values.environmentVariables }} + {{ $k }}: {{ $v | quote }} +{{- end }} diff --git a/templates/deployment-beat.yaml b/templates/deployment-beat.yaml index e4c8992..efcb79d 100644 --- a/templates/deployment-beat.yaml +++ b/templates/deployment-beat.yaml @@ -13,6 +13,8 @@ spec: metadata: annotations: checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + tag: {{ .Values.image.tag }} labels: {{- include "glitchtip.selectorLabels" . | nindent 8 }} spec: @@ -51,7 +53,7 @@ spec: valueFrom: secretKeyRef: key: redis-password - name: {{ include "glitchtip.fullname" . }}-glitchtip-redis + name: {{ include "glitchtip.fullname" . }}-redis - name: REDIS_HOST value: {{ template "glitchtip.redis.host" . }} - name: REDIS_PORT @@ -60,3 +62,5 @@ spec: envFrom: - secretRef: name: {{ include "glitchtip.fullname" . }} + - configMapRef: + name: {{ include "glitchtip.fullname" . }} diff --git a/templates/deployment-worker.yaml b/templates/deployment-worker.yaml index 7605d56..9d16bc7 100644 --- a/templates/deployment-worker.yaml +++ b/templates/deployment-worker.yaml @@ -13,6 +13,8 @@ spec: metadata: annotations: checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + tag: {{ .Values.image.tag }} labels: {{- include "glitchtip.selectorLabels" . | nindent 8 }} spec: @@ -46,7 +48,7 @@ spec: valueFrom: secretKeyRef: key: redis-password - name: {{ include "glitchtip.fullname" . }}-glitchtip-redis + name: {{ include "glitchtip.fullname" . }}-redis - name: REDIS_HOST value: {{ template "glitchtip.redis.host" . }} - name: REDIS_PORT @@ -55,6 +57,8 @@ spec: envFrom: - secretRef: name: {{ include "glitchtip.fullname" . }} + - configMapRef: + name: {{ include "glitchtip.fullname" . }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 31a0f2d..977b3f9 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -14,6 +14,8 @@ spec: metadata: annotations: checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + tag: {{ .Values.image.tag }} labels: {{- include "glitchtip.selectorLabels" . | nindent 8 }} role: web @@ -56,8 +58,6 @@ spec: value: "False" - name: STATIC_URL value: / - - name: ENABLE_SOCIAL_AUTH - value: {{ .Values.enableSocialAuth | quote }} {{- if .Values.redisURL }} - name: REDIS_URL value: {{ .Values.redisURL }} @@ -67,15 +67,21 @@ spec: valueFrom: secretKeyRef: key: redis-password - name: {{ include "glitchtip.fullname" . }}-glitchtip-redis + name: {{ include "glitchtip.fullname" . }}-redis - name: REDIS_HOST value: {{ template "glitchtip.redis.host" . }} - name: REDIS_PORT value: {{ template "glitchtip.redis.port" . }} {{- end }} + - name: POD_IP + valueFrom: + fieldRef: + fieldPath: status.podIP envFrom: - secretRef: name: {{ include "glitchtip.fullname" . }} + - configMapRef: + name: {{ include "glitchtip.fullname" . }} {{- with .Values.web.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/templates/pre-install-job.yaml b/templates/pre-install-job.yaml index 43e7bbd..6d33f1c 100644 --- a/templates/pre-install-job.yaml +++ b/templates/pre-install-job.yaml @@ -7,6 +7,10 @@ metadata: annotations: "helm.sh/hook": post-install,pre-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded + "helm.sh/hook-weight": "0" + checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }} + checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + tag: {{ .Values.image.tag }} spec: activeDeadlineSeconds: 180 template: @@ -15,6 +19,7 @@ spec: containers: - name: pre-install-job image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} command: ["./manage.py","migrate"] env: - name: DEBUG @@ -22,6 +27,6 @@ spec: - name: STATIC_URL value: / - name: DATABASE_URL - value: {{ required "databaseURL is a required value." .Values.databaseURL | quote }} + value: {{ required "databaseURL is a required value." .Values.databaseURL }} - name: SECRET_KEY - value: {{ required "secretKey is a required value." .Values.secretKey | quote }} \ No newline at end of file + value: {{ required "secretKey is a required value." .Values.secretKey }} diff --git a/templates/secrets.yaml b/templates/secrets.yaml index 0641d3f..9fcb4c0 100644 --- a/templates/secrets.yaml +++ b/templates/secrets.yaml @@ -8,4 +8,10 @@ type: Opaque data: DATABASE_URL: {{ required "databaseURL is a required value." .Values.databaseURL | b64enc | quote }} SECRET_KEY: {{ required "secretKey is a required value." .Values.secretKey | b64enc | quote }} - REDIS_URL: {{ printf "redis://:@glitchtip-staging-glitchtip-redis-master:6379/0" | b64enc | quote }} \ No newline at end of file + REDIS_URL: {{ printf "redis://:@glitchtip-staging-redis-master:6379/0" | b64enc | quote }} +{{- if .Values.stripeLiveSecretKey }} + STRIPE_LIVE_SECRET_KEY: {{ .Values.stripeLiveSecretKey | b64enc | quote }} +{{- end }} +{{- if .Values.djstripeWebhookSecret }} + DJSTRIPE_WEBHOOK_SECRET: {{ .Values.djstripeWebhookSecret | b64enc | quote }} +{{- end }} diff --git a/values-sample.yaml b/values-sample.yaml index 7c68fc1..df6c311 100644 --- a/values-sample.yaml +++ b/values-sample.yaml @@ -12,3 +12,7 @@ web: worker: hpa: enabled: true + +environmentVariables: + ENABLE_SOCIAL_AUTH: true + GLITCHTIP_DOMAIN: https://staging.glitchtip.com diff --git a/values.yaml b/values.yaml index 3776ccb..d98957b 100644 --- a/values.yaml +++ b/values.yaml @@ -13,16 +13,23 @@ fullnameOverride: "" databaseURL: secretKey: redisURL: -enableSocialAuth: false +# Only needed when using stripe for saas environment +stripeLiveSecretKey: +djstripeWebhookSecret: + +environmentVariables: + ENABLE_SOCIAL_AUTH: false + GLITCHTIP_DOMAIN: https://example.com web: replicaCount: 1 hpa: enabled: false - cputhreshold: 60 + cputhreshold: 70 minpods: 2 - maxpods: 5 - resources: {} + maxpods: 4 + resources: + {} # limits: # cpu: 100m # memory: 256Mi @@ -45,10 +52,11 @@ worker: replicaCount: 1 hpa: enabled: false - cputhreshold: 60 + cputhreshold: 90 minpods: 1 - maxpods: 10 - resources: {} + maxpods: 4 + resources: + {} # limits: # cpu: 500m # memory: 256Mi @@ -72,7 +80,8 @@ service: ingress: enabled: false - annotations: {} + annotations: + {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: @@ -85,7 +94,6 @@ ingress: redis: enabled: true - nameOverride: glitchtip-redis master: persistence: enabled: false @@ -98,4 +106,4 @@ redis: # Default to disabled, use a managed database service. But can be enabled here. postgresql: - enabled: false \ No newline at end of file + enabled: false