diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index e3ab061..0000000 --- a/.drone.yml +++ /dev/null @@ -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: {} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26aa323..8079228 100644 --- a/.gitlab-ci.yml +++ b/.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: diff --git a/.gitmodules b/.gitmodules index 0290350..1ad4fb4 100644 --- a/.gitmodules +++ b/.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 diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 8a85976..0000000 --- a/CHANGELOG +++ /dev/null @@ -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 diff --git a/Chart.lock b/Chart.lock index 4973b71..07b7538 100644 --- a/Chart.lock +++ b/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 15.5.16 + version: 12.1.2 - 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: 17.3.11 +digest: sha256:673a43db19febf733c07fc432dc458d89fac3a790e63e888fe51c12d79050df2 +generated: "2022-11-18T09:35:40.886570292-05:00" diff --git a/Chart.yaml b/Chart.yaml index 048d1ae..187f14e 100644 --- a/Chart.yaml +++ b/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.2.8 # 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: 2.0.6 icon: https://glitchtip.gitlab.io/glitchtip-helm-chart/icon.svg dependencies: - name: postgresql - version: ^15.2.5 + version: ^12.1.2 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled - name: redis - version: ^19.1.0 + version: ^17.3.11 repository: https://charts.bitnami.com/bitnami condition: redis.enabled diff --git a/README.md b/README.md index 6187bcd..6fcafb3 100644 --- a/README.md +++ b/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. diff --git a/charts/postgresql-12.1.2.tgz b/charts/postgresql-12.1.2.tgz new file mode 100644 index 0000000..2292c45 Binary files /dev/null and b/charts/postgresql-12.1.2.tgz differ diff --git a/charts/postgresql-15.5.16.tgz b/charts/postgresql-15.5.16.tgz deleted file mode 100644 index 3c4bc38..0000000 Binary files a/charts/postgresql-15.5.16.tgz and /dev/null differ diff --git a/charts/redis-17.3.11.tgz b/charts/redis-17.3.11.tgz new file mode 100644 index 0000000..655526f Binary files /dev/null and b/charts/redis-17.3.11.tgz differ diff --git a/charts/redis-19.6.1.tgz b/charts/redis-19.6.1.tgz deleted file mode 100644 index f517dcf..0000000 Binary files a/charts/redis-19.6.1.tgz and /dev/null differ diff --git a/django-helm-chart b/django-helm-chart index 4c7256e..ccfcb1b 160000 --- a/django-helm-chart +++ b/django-helm-chart @@ -1 +1 @@ -Subproject commit 4c7256e5c96d18e4f187074354690a11d65b57fe +Subproject commit ccfcb1bc23415b173a997f0844a1b20ca81fc7c8 diff --git a/values.yaml b/values.yaml index 415b0b5..6e1c49c 100644 --- a/values.yaml +++ b/values.yaml @@ -1,7 +1,7 @@ # Default values for glitchtip. image: repository: glitchtip/glitchtip - tag: v4.1.1 + tag: v2.0.6 pullPolicy: IfNotPresent imagePullSecrets: [] @@ -12,26 +12,20 @@ env: normal: ENABLE_SOCIAL_AUTH: false GLITCHTIP_DOMAIN: https://example.com - CELERY_WORKER_AUTOSCALE: "1,3" - CELERY_WORKER_MAX_TASKS_PER_CHILD: "10000" + CELERY_WORKER_CONCURRENCY: "2" # Remove to set to number of cpus 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 +34,9 @@ web: memory: 512Mi requests: cpu: 100m - memory: 256Mi + memory: 128Mi nodeSelector: {} tolerations: [] - podAnnotations: {} affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -59,7 +52,7 @@ web: livenessProbe: failureThreshold: 5 initialDelaySeconds: 5 - timeoutSeconds: 3 + timeoutSeconds: 2 readinessProbe: failureThreshold: 10 initialDelaySeconds: 5 @@ -90,80 +83,33 @@ 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 + cpu: 100m + memory: 120Mi requests: cpu: 1m - memory: 130Mi + memory: 90Mi 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 create: false @@ -171,7 +117,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 +128,7 @@ 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 + #auth: + # password: # Must be set