.drone.yml

@@ -1,40 +0,0 @@
----
-kind: pipeline
-type: docker
-name: default
-
-steps:
-- name: submodules
-  image: alpine/git
-  commands:
-  - git submodule update --init --recursive
-
-- name: build
-  image: alpine/helm
-  volumes:
-  - name: result
-    path: /output
-  commands:
-  - helm lint --set redis.enabled=false
-  - helm package -d chart .
-  - mv chart/glitchtip*.tgz /output/glitchtip.tgz
-
-- name: upload
-  image: curlimages/curl:latest
-  environment:
-    GIT_HOST: git.kurocon.nl
-    GIT_PACKAGE_OWNER: KuroNET
-    GIT_USER:
-      from_secret: git_username
-    GIT_TOKEN:
-      from_secret: git_password_or_token
-  volumes:
-  - name: result
-    path: /output
-  commands:
-  - curl --user $GIT_USER:$GIT_TOKEN -X POST --upload-file /output/glitchtip.tgz https://$GIT_HOST/api/packages/{$GIT_PACKAGE_OWNER}/helm/api/charts
-
-
-volumes:
-- name: result
-  temp: {}

.gitlab-ci.yml

@@ -11,7 +11,7 @@ build:
     entrypoint: ["/bin/sh", "-c"]
   stage: build
   script:
-    - helm lint --set redis.enabled=false
+    - helm lint
     - helm package -d chart .
     - mv chart/glitchtip*.tgz chart/glitchtip.tgz
   artifacts:
@@ -26,4 +26,14 @@ upload:
   script:
     - 'curl --request POST --user gitlab-ci-token:$CI_JOB_TOKEN --form "chart=@chart/glitchtip.tgz" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/stable/charts"'
   only:
-    - tags
+    - master
+
+pages:
+  stage: upload
+  artifacts:
+    paths:
+    - public
+  script:
+    - ls public
+  only:
+  - master

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "django-helm-chart"]
 	path = django-helm-chart
-	url = https://git.kurocon.nl/KuroNET/django-helm-chart.git
+	url = https://gitlab.com/burke-software/django-helm-chart.git

CHANGELOG

@@ -1,9 +0,0 @@
-# Unreleased
-
-# 4.0.0
-
-- (Breaking) Rename value preInstall to migrationJob
-- The migration job now runs the migrate script which includes pgpartition. This should help ensure it runs more often as a failsafe should celery fail.
-- Add some support for volume mounts, not well tested
-- Started this changelog
-- Updated chart dependencies to latest versions

Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 15.5.16
+  version: 11.1.15
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 19.6.1
-digest: sha256:39ccb3c76f7a8587ce6623d8b563cefcb3c63a7376768a901ae8092ca4fd9b82
-generated: "2024-07-15T16:16:16.67406353-04:00"
+  version: 16.5.5
+digest: sha256:c769fee32aa0f3e27d2bdb7ac74867a60a02da0fc123ba73e68f52c00044fe89
+generated: "2022-04-05T10:30:44.77043487-04:00"

Chart.yaml

@@ -14,20 +14,20 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 4.0.1
+version: 0.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 4.1.1
+appVersion: 1.0.0
 
 icon: https://glitchtip.gitlab.io/glitchtip-helm-chart/icon.svg
 
 dependencies:
   - name: postgresql
-    version: ^15.2.5
+    version: ~11.1.9
     repository: https://charts.bitnami.com/bitnami
     condition: postgresql.enabled
   - name: redis
-    version: ^19.1.0
+    version: ~16.5.5
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled

README.md

@@ -18,21 +18,19 @@ For postgresql, we recommend an externally managed database and providing only t
 ## Important Tips
 
 - Use [helm diff](https://github.com/databus23/helm-diff) to preview changes
+- We don't update the chart version for app version updates at this time, set image.tag instead.
 - Set image.pullPolicy to `IfNotPresent` after specifying the image.tag
 - Set redis.auth.password to avoid redis being entirely remade on each release
 - If updating the chart, carefully review values for any new defaults
 
 ## Updating
 
-See changes in this chart on [GitLab](https://gitlab.com/glitchtip/glitchtip-helm-chart/-/releases)
-
 - `helm repo update`
 - Set the image.tag to the [latest version](https://gitlab.com/glitchtip/glitchtip-frontend/-/releases)
 - `helm diff upgrade glitchtip glitchtip/glitchtip`
 - Carefully review diff
 - `helm upgrade glitchtip glitchtip/glitchtip -f your-values.yaml`
 
-
 # Contributing
 
 Please open issues only with potential solutions and be prepared to do some work or else fund it. Contributors are welcome. However, we kindly ask that feature requests and support requests not be opened in this repo.

django-helm-chart

@@ -1 +1 @@
-Subproject commit 4c7256e5c96d18e4f187074354690a11d65b57fe
+Subproject commit 74f1ec9f6c770f43fa1a2c1af30f53262aaa6193

values.sample.yaml

@@ -1,5 +1,5 @@
 image:
-  tag: v2.0.4  # Make this the latest version, then change it to upgrade
+  tag: v1.11.1  # Make this the latest version, then change it to upgrade
   pullPolicy: IfNotPresent
 env:
   normal:
@@ -10,8 +10,7 @@ env:
     # DATABASE_URL: postgres://postgres:postgres@postgres:5432/postgres 
 postgresql:
   enabled: true  # Be careful upgrading. The postgresql helm chart does not support major upgrades.
-  auth:
-    postgresPassword: change_this  # Without setting this, you'll have to set the password on each upgrade
+  postgresqlPassword: mypass
   primary:
     persistence:
       size: 10Gi  # Default is 8, may want this considerably higher

values.yaml

@@ -1,8 +1,8 @@
 # Default values for glitchtip.
 image:
   repository: glitchtip/glitchtip
-  tag: v4.1.1
-  pullPolicy: IfNotPresent
+  tag: latest
+  pullPolicy: Always
 
 imagePullSecrets: []
 nameOverride: ""
@@ -12,26 +12,19 @@ env:
   normal:
     ENABLE_SOCIAL_AUTH: false
     GLITCHTIP_DOMAIN: https://example.com
-    CELERY_WORKER_AUTOSCALE: "1,3"
-    CELERY_WORKER_MAX_TASKS_PER_CHILD: "10000"
   secret:
     SECRET_KEY: # Required
     # DATABASE_URL: Specify if using external postgres (not managed by this chart)
     # REDIS_URL: Specify if using external redis (not managed by this chart)
 
-migrationJob:
-  enabled: true
-  command: ["bin/run-migrate.sh"]
-  activeDeadlineSeconds: 900
-
 web:
   replicaCount: 2
   autoscaling:
     enabled: false
     minReplicas: 2
     maxReplicas: 10
-    targetCPU: 80
-    # targetMemory: 80
+    targetCPUUtilizationPercentage: 80
+    # targetMemoryUtilizationPercentage: 80
   budget:
     minAvailable: 1
   resources:
@@ -40,10 +33,9 @@ web:
       memory: 512Mi
     requests:
       cpu: 100m
-      memory: 256Mi
+      memory: 128Mi
   nodeSelector: {}
   tolerations: []
-  podAnnotations: {}
   affinity:
     podAntiAffinity:
       preferredDuringSchedulingIgnoredDuringExecution:
@@ -59,7 +51,7 @@ web:
   livenessProbe:
     failureThreshold: 5
     initialDelaySeconds: 5
-    timeoutSeconds: 3
+    timeoutSeconds: 2
   readinessProbe:
     failureThreshold: 10
     initialDelaySeconds: 5
@@ -90,79 +82,22 @@ worker:
   autoscaling:
     enabled: false
     minReplicas: 1
-    maxReplicas: 10
-    targetCPU: 100
-    # targetMemory: 100
-  livenessProbe:
-    initialDelaySeconds: 10
-    periodSeconds: 60
-    timeoutSeconds: 30
-    exec:
-      command:
-        - "bash"
-        - "-c"
-        - "celery -A glitchtip inspect ping -d celery@$HOSTNAME | grep -q OK"
+    maxReplicas: 100
+    targetCPUUtilizationPercentage: 90
+    # targetMemoryUtilizationPercentage: 80
   resources:
     limits:
       cpu: 900m
       memory: 768Mi
     requests:
       cpu: 100m
-      memory: 350Mi
+      memory: 128Mi
   nodeSelector: {}
   tolerations: []
-  podAnnotations: {}
   affinity: {}
 
 beat:
   enabled: true
-  resources:
-    limits:
-      cpu: 200m
-      memory: 150Mi
-    requests:
-      cpu: 1m
-      memory: 130Mi
-  nodeSelector: {}
-  tolerations: []
-  podAnnotations: {}
-  affinity: {}
-
-flower:
-  enabled: false
-  image:
-    repository: mher/flower
-    tag: latest
-    pullPolicy: IfNotPresent
-  resources:
-    limits:
-      cpu: 500m
-      memory: 512Mi
-    requests:
-      cpu: 50m
-      memory: 256Mi
-  nodeSelector: {}
-  tolerations: []
-  podAnnotations: {}
-  affinity: {}
-  service:
-    type: ClusterIP
-    port: 80
-  ingress:
-    enabled: false
-    annotations:
-      {}
-      # kubernetes.io/ingress.class: nginx
-      # kubernetes.io/tls-acme: "true"
-    hosts:
-      - host: chart-example.local
-        paths:
-          - path: /
-            pathType: ImplementationSpecific
-    tls: []
-    #  - secretName: chart-example-tls
-    #    hosts:
-    #      - chart-example.local
 
 serviceAccount:
   # Specifies whether a service account should be created
@@ -171,7 +106,7 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name:
 
-# For configuration options, see https://artifacthub.io/packages/helm/bitnami/redis
+
 redis:
   enabled: true
   architecture: standalone
@@ -182,8 +117,6 @@ redis:
       enabled: false
 
 # Default to disabled, use a managed database service. But can be enabled here.
-# For configuration options, see https://artifacthub.io/packages/helm/bitnami/postgresql
 postgresql:
   enabled: false
-  # auth:
-  #   postgresPassword: # Must be set
+  postgresqlPassword: # Must be set