Skip to content

Commit

Permalink
Merge branch 'main' into renovate/giantswarm-prometheus-operator-crd-…
Browse files Browse the repository at this point in the history
…13.x
  • Loading branch information
hervenicol authored Nov 18, 2024
2 parents 4083fe6 + 892d052 commit 3549817
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- Add `alloy` v0.7.0 as `alloyEvents`.

### Changed

- Upgrade `alloy-logs` and `alloy-metrics` to chart 0.7.0.
- Bumps `alloy` from 1.4.2 to 1.5.0
- upgrade `kube-prometheus-stack` from 65.1.1 to 66.2.1
- prometheus-operator CRDs from 0.75.0 to 0.78.1
- prometheus-operator from 0.77.1 to 0.78.1
Expand Down
25 changes: 23 additions & 2 deletions helm/observability-bundle/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,27 @@ userConfig:
enabled: false

apps:
alloyEvents:
appName: alloy-events
chartName: alloy
catalog: giantswarm
dependsOn: prometheus-operator-crd
enabled: false
namespace: kube-system
# used by renovate
# repo: giantswarm/alloy-app
version: 0.7.0
# a list of extraConfigs for the App,
# It can be secret or configmap
# https://github.com/giantswarm/rfc/tree/main/multi-layer-app-config#example
extraConfigs:
- kind: secret
name: "{{ $.Values.clusterID }}-events-logger-secret"
namespace: "{{ $.Release.Namespace }}"
- kind: configMap
name: "{{ $.Values.clusterID }}-events-logger-config"
namespace: "{{ $.Release.Namespace }}"

alloyLogs:
appName: alloy-logs
chartName: alloy
Expand All @@ -54,7 +75,7 @@ apps:
namespace: kube-system
# used by renovate
# repo: giantswarm/alloy-app
version: 0.6.1
version: 0.7.0
# a list of extraConfigs for the App,
# It can be secret or configmap
# https://github.com/giantswarm/rfc/tree/main/multi-layer-app-config#example
Expand All @@ -75,7 +96,7 @@ apps:
namespace: kube-system
# used by renovate
# repo: giantswarm/alloy-app
version: 0.6.1
version: 0.7.0
# a list of extraConfigs for the App,
# It can be secret or configmap
# https://github.com/giantswarm/rfc/tree/main/multi-layer-app-config#example
Expand Down

0 comments on commit 3549817

Please sign in to comment.