diff --git a/.github/workflows/linting-and-tests.yml b/.github/workflows/linting-and-tests.yml index f7cb062b..4bf8ae8d 100644 --- a/.github/workflows/linting-and-tests.yml +++ b/.github/workflows/linting-and-tests.yml @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index b098094f..cd0f0133 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/helm/README.md b/helm/README.md index 698a9664..0e538b25 100644 --- a/helm/README.md +++ b/helm/README.md @@ -20,10 +20,7 @@ ```bash helm install helm-testing \ --wait \ - --timeout 30m \ - --wait-for-jobs \ --values ./simple.yml \ - --values ./values-arm64.yml \ ./oncall ``` diff --git a/helm/oncall/Chart.yaml b/helm/oncall/Chart.yaml index 44c975eb..5fae0986 100644 --- a/helm/oncall/Chart.yaml +++ b/helm/oncall/Chart.yaml @@ -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 diff --git a/helm/oncall/charts/grafana-6.29.6.tgz b/helm/oncall/charts/grafana-6.29.6.tgz deleted file mode 100644 index ed0a64c9..00000000 Binary files a/helm/oncall/charts/grafana-6.29.6.tgz and /dev/null differ diff --git a/helm/oncall/charts/grafana-6.57.1.tgz b/helm/oncall/charts/grafana-6.57.1.tgz new file mode 100644 index 00000000..25121669 Binary files /dev/null and b/helm/oncall/charts/grafana-6.57.1.tgz differ diff --git a/helm/oncall/charts/mariadb-11.0.10.tgz b/helm/oncall/charts/mariadb-11.0.10.tgz deleted file mode 100644 index 0e41a301..00000000 Binary files a/helm/oncall/charts/mariadb-11.0.10.tgz and /dev/null differ diff --git a/helm/oncall/charts/mariadb-12.2.5.tgz b/helm/oncall/charts/mariadb-12.2.5.tgz new file mode 100644 index 00000000..d9b8b659 Binary files /dev/null and b/helm/oncall/charts/mariadb-12.2.5.tgz differ diff --git a/helm/oncall/charts/rabbitmq-10.1.1.tgz b/helm/oncall/charts/rabbitmq-10.1.1.tgz deleted file mode 100644 index 955e49d1..00000000 Binary files a/helm/oncall/charts/rabbitmq-10.1.1.tgz and /dev/null differ diff --git a/helm/oncall/charts/rabbitmq-12.0.0.tgz b/helm/oncall/charts/rabbitmq-12.0.0.tgz new file mode 100644 index 00000000..0be84a07 Binary files /dev/null and b/helm/oncall/charts/rabbitmq-12.0.0.tgz differ diff --git a/helm/oncall/charts/redis-16.10.1.tgz b/helm/oncall/charts/redis-16.10.1.tgz deleted file mode 100644 index dfb1e8df..00000000 Binary files a/helm/oncall/charts/redis-16.10.1.tgz and /dev/null differ diff --git a/helm/oncall/charts/redis-16.13.2.tgz b/helm/oncall/charts/redis-16.13.2.tgz new file mode 100644 index 00000000..33b5e967 Binary files /dev/null and b/helm/oncall/charts/redis-16.13.2.tgz differ diff --git a/helm/oncall/templates/engine/deployment.yaml b/helm/oncall/templates/engine/deployment.yaml index f0848c76..ba9bb820 100644 --- a/helm/oncall/templates/engine/deployment.yaml +++ b/helm/oncall/templates/engine/deployment.yaml @@ -86,7 +86,7 @@ spec: httpGet: path: /startupprobe/ port: http - periodSeconds: 60 + periodSeconds: 10 timeoutSeconds: 3 resources: {{- toYaml .Values.engine.resources | nindent 12 }} diff --git a/helm/oncall/values.yaml b/helm/oncall/values.yaml index 2616a89c..5fc5fafb 100644 --- a/helm/oncall/values.yaml +++ b/helm/oncall/values.yaml @@ -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 diff --git a/helm/values-arm64.yml b/helm/values-arm64.yml deleted file mode 100644 index 7d59ae5a..00000000 --- a/helm/values-arm64.yml +++ /dev/null @@ -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 \ No newline at end of file