Upgrade helm dependecies, improve local setup (#2144)

# What this PR does
* Upgrade to the recent Grafana
* Upgrade to the recent bitnami mariadb, rabbitmq charts which support
arm64 now
* Remove deprecated psp policies from grafana chart
* Make startupProbe period smaller to increase installation speed 


## Which issue(s) this PR fixes

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required)
- [ ] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not
required)
This commit is contained in:
Ildar Iskhakov 2023-06-09 15:16:51 +08:00 committed by GitHub
parent 47042decb7
commit 1a6e30c249
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 12 additions and 24 deletions

View file

@ -388,7 +388,6 @@ jobs:
--set grafana.env.GF_FEATURE_TOGGLES_ENABLE=topnav \
--set grafana.env.GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=grafana-oncall-app \
--set-json "grafana.plugins=[]" \
--set-json 'grafana.securityContext={"runAsUser": 0, "runAsGroup": 0, "fsGroup": 0}' \
--set-json 'grafana.extraVolumeMounts=[{"name":"plugins","mountPath":"/var/lib/grafana/plugins/grafana-plugin","hostPath":"/oncall-plugin","readOnly":true}]' \
./helm/oncall

View file

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
### Changed
- Helm chart: Upgrade helm dependecies, improve local setup [#2144](https://github.com/grafana/oncall/pull/2144)
### Fixed
- Fix receive channel filter in alert groups API [#2140](https://github.com/grafana/oncall/pull/2140)

View file

@ -20,10 +20,7 @@
```bash
helm install helm-testing \
--wait \
--timeout 30m \
--wait-for-jobs \
--values ./simple.yml \
--values ./values-arm64.yml \
./oncall
```

View file

@ -2,6 +2,7 @@ apiVersion: v2
name: oncall
description: Developer-friendly incident response with brilliant Slack integration
type: application
# version and appVersion are handled by CI, no need to change them manually
version: 1.2.36
appVersion: v1.2.36
dependencies:
@ -10,7 +11,7 @@ dependencies:
repository: https://charts.jetstack.io
condition: cert-manager.enabled
- name: mariadb
version: 11.0.10
version: 12.2.5
repository: https://charts.bitnami.com/bitnami
condition: mariadb.enabled
- name: postgresql
@ -18,7 +19,7 @@ dependencies:
repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
- name: rabbitmq
version: 10.3.9
version: 12.0.0
repository: https://charts.bitnami.com/bitnami
condition: rabbitmq.enabled
- name: redis
@ -26,7 +27,7 @@ dependencies:
repository: https://charts.bitnami.com/bitnami
condition: redis.enabled
- name: grafana
version: 6.29.6
version: 6.57.1
repository: https://grafana.github.io/helm-charts
condition: grafana.enabled
- name: ingress-nginx

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -86,7 +86,7 @@ spec:
httpGet:
path: /startupprobe/
port: http
periodSeconds: 60
periodSeconds: 10
timeoutSeconds: 3
resources:
{{- toYaml .Values.engine.resources | nindent 12 }}

View file

@ -327,6 +327,9 @@ grafana:
serve_from_sub_path: true
persistence:
enabled: true
# Disable psp as PodSecurityPolicy is deprecated in v1.21+, unavailable in v1.25+
rbac:
pspEnabled: false
plugins:
- grafana-oncall-app

View file

@ -1,16 +0,0 @@
# Substituting bitnami image with official image
# to be able to run Rabbitmq on arm64 (Mac M1)
# Optional for amd64 systems
rabbitmq:
enabled: true
image:
repository: rabbitmq
tag: 3.10.10
auth:
username: user
password: user
extraEnvVars:
- name: RABBITMQ_DEFAULT_USER
value: user
- name: RABBITMQ_DEFAULT_PASS
value: user