Skip to content

Commit

Permalink
Merge branch 'grafana:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
gasmick authored Apr 17, 2024
2 parents 953c3d8 + d2d9da9 commit 4c93d0f
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 21 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
/charts/enterprise-logs/ @grafana/loki-squad
/charts/tempo-vulture/ @grafana/tempo @Whyeasy @dgzlopes
/charts/synthetic-monitoring-agent/ @torstenwalter @zanhsieh
/charts/agent-operator/ @grafana/grafana-agent-maintainers
8 changes: 4 additions & 4 deletions charts/agent-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apiVersion: v2
name: grafana-agent-operator
description: A Helm chart for Grafana Agent Operator
type: application
version: 0.3.20
appVersion: "0.40.3"
version: 0.3.21
appVersion: "0.40.4"
home: https://grafana.com/docs/agent/v0.40/
icon: https://raw.githubusercontent.com/grafana/agent/v0.40.3/docs/sources/assets/logo_and_name.png
icon: https://raw.githubusercontent.com/grafana/agent/v0.40.4/docs/sources/assets/logo_and_name.png
sources:
- https://github.com/grafana/agent/tree/v0.40.3/pkg/operator
- https://github.com/grafana/agent/tree/v0.40.4/pkg/operator
maintainers:
- name: Grafana Agent Team
email: grafana-agent-team@googlegroups.com
6 changes: 3 additions & 3 deletions charts/agent-operator/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# grafana-agent-operator

![Version: 0.3.20](https://img.shields.io/badge/Version-0.3.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.3](https://img.shields.io/badge/AppVersion-0.40.3-informational?style=flat-square)
![Version: 0.3.21](https://img.shields.io/badge/Version-0.3.21-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.40.4](https://img.shields.io/badge/AppVersion-0.40.4-informational?style=flat-square)

A Helm chart for Grafana Agent Operator

⚠️ **Please create issues relating to this Helm chart in the [Agent](https://github.com/grafana/agent/issues) repo.**

## Source Code

* <https://github.com/grafana/agent/tree/v0.40.3/pkg/operator>
* <https://github.com/grafana/agent/tree/v0.40.4/pkg/operator>

Note that this chart does not provision custom resources like `GrafanaAgent` and `MetricsInstance` (formerly `PrometheusInstance`) or any `*Monitor` resources.

Expand Down Expand Up @@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
| image.pullSecrets | list | `[]` | Image pull secrets |
| image.registry | string | `"docker.io"` | Image registry |
| image.repository | string | `"grafana/agent-operator"` | Image repo |
| image.tag | string | `"v0.40.3"` | Image tag |
| image.tag | string | `"v0.40.4"` | Image tag |
| kubeletService | object | `{"namespace":"default","serviceName":"kubelet"}` | If both are set, Agent Operator will create and maintain a service for scraping kubelets https://grafana.com/docs/agent/latest/operator/getting-started/#monitor-kubelets |
| nameOverride | string | `""` | Overrides the chart's name |
| nodeSelector | object | `{}` | nodeSelector configuration |
Expand Down
2 changes: 1 addition & 1 deletion charts/agent-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ image:
# -- Image repo
repository: grafana/agent-operator
# -- Image tag
tag: v0.40.3
tag: v0.40.4
# -- Image pull policy
pullPolicy: IfNotPresent
# -- Image pull secrets
Expand Down
4 changes: 2 additions & 2 deletions charts/grafana/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: grafana
version: 7.3.7
appVersion: 10.4.0
version: 7.3.8
appVersion: 10.4.1
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
home: https://grafana.com
Expand Down
4 changes: 2 additions & 2 deletions charts/rollout-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: rollout-operator
description: "Grafana rollout-operator"
type: application
version: 0.14.0
appVersion: v0.13.0
version: 0.15.0
appVersion: v0.14.0
home: https://github.com/grafana/rollout-operator
kubeVersion: ^1.10.0-0
2 changes: 1 addition & 1 deletion charts/rollout-operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r

# rollout-operator

![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.13.0](https://img.shields.io/badge/AppVersion-v0.13.0-informational?style=flat-square)
![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.14.0](https://img.shields.io/badge/AppVersion-v0.14.0-informational?style=flat-square)

Grafana rollout-operator

Expand Down
2 changes: 1 addition & 1 deletion charts/tempo-distributed/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: tempo-distributed
description: Grafana Tempo in MicroService mode
type: application
version: 1.9.1
version: 1.9.2
appVersion: 2.4.1
engine: gotpl
home: https://grafana.com/docs/tempo/latest/
Expand Down
11 changes: 7 additions & 4 deletions charts/tempo-distributed/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tempo-distributed

![Version: 1.9.1](https://img.shields.io/badge/Version-1.9.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)
![Version: 1.9.2](https://img.shields.io/badge/Version-1.9.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.4.1](https://img.shields.io/badge/AppVersion-2.4.1-informational?style=flat-square)

Grafana Tempo in MicroService mode

Expand Down Expand Up @@ -387,9 +387,12 @@ The memcached default args are removed and should be provided manually. The sett
| enterpriseGateway.resources.requests.cpu | string | `"10m"` | |
| enterpriseGateway.resources.requests.memory | string | `"32Mi"` | |
| enterpriseGateway.securityContext | object | `{}` | |
| enterpriseGateway.service.annotations | object | `{}` | |
| enterpriseGateway.service.labels | object | `{}` | |
| enterpriseGateway.service.port | string | `nil` | If the port is left undefined, the service will listen on the same port as the pod |
| enterpriseGateway.service.annotations | object | `{}` | Annotations for the enterprise gateway service |
| enterpriseGateway.service.clusterIP | string | `nil` | ClusterIP of the enterprise gateway service |
| enterpriseGateway.service.labels | object | `{}` | Labels for enterprise gateway service |
| enterpriseGateway.service.loadBalancerIP | string | `nil` | Load balancer IPO address if service type is LoadBalancer for enterprise gateway service |
| enterpriseGateway.service.port | string | `nil` | Port of the enterprise gateway service; if left undefined, the service will listen on the same port as the pod |
| enterpriseGateway.service.type | string | `"ClusterIP"` | Type of the enterprise gateway service |
| enterpriseGateway.strategy.rollingUpdate.maxSurge | int | `0` | |
| enterpriseGateway.strategy.rollingUpdate.maxUnavailable | int | `1` | |
| enterpriseGateway.strategy.type | string | `"RollingUpdate"` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ metadata:
{{- toYaml .Values.enterpriseGateway.service.annotations | nindent 4 }}
namespace: {{ .Release.Namespace | quote }}
spec:
type: ClusterIP
type: {{ .Values.enterpriseGateway.service.type }}
{{- with .Values.enterpriseGateway.service.clusterIP }}
clusterIP: {{ . }}
{{- end }}
{{- if and (eq "LoadBalancer" .Values.enterpriseGateway.service.type) .Values.enterpriseGateway.service.loadBalancerIP }}
loadBalancerIP: {{ .Values.enterpriseGateway.service.loadBalancerIP }}
{{- end }}
ports:
- port: {{ .Values.enterpriseGateway.service.port | default (include "tempo.serverHttpListenPort" . ) }}
protocol: TCP
Expand Down
12 changes: 10 additions & 2 deletions charts/tempo-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2009,10 +2009,18 @@ enterpriseGateway:

annotations: {}
service:
# -- Port of the enterprise gateway service; if left undefined, the service will listen on the same port as the pod
port: null
# -- Type of the enterprise gateway service
type: ClusterIP
# -- ClusterIP of the enterprise gateway service
clusterIP: null
# -- Load balancer IPO address if service type is LoadBalancer for enterprise gateway service
loadBalancerIP: null
# -- Annotations for the enterprise gateway service
annotations: {}
# -- Labels for enterprise gateway service
labels: {}
# -- If the port is left undefined, the service will listen on the same port as the pod
port: null

strategy:
type: RollingUpdate
Expand Down

0 comments on commit 4c93d0f

Please sign in to comment.