Skip to content

Commit b73c61a

Browse files
Sheikh-AbubakerSheikh-Abubaker
committed
Resolve Merge Conflicts
Signed-off-by: Sheikh-Abubaker <sheikhabubaker761@gmail.com>
2 parents b107a90 + 96fbbc1 commit b73c61a

File tree

18 files changed

+61
-53
lines changed

18 files changed

+61
-53
lines changed

‎.github/workflows/update-helm-repo.yaml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -145,19 +145,6 @@ jobs:
145145
with:
146146
version: v3.5.2
147147

148-
- name: Add dependency chart repos
149-
# Todo replace this by https://github.com/grafana/helm-charts/issues/1534
150-
run: |
151-
helm repo add elastic https://helm.elastic.co
152-
helm repo add grafana https://grafana.github.io/helm-charts
153-
helm repo add prometheus https://prometheus-community.github.io/helm-charts
154-
helm repo add bitnami https://charts.bitnami.com/bitnami
155-
helm repo add bitnami-pre-2022 https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami
156-
helm repo add hashicorp https://helm.releases.hashicorp.com
157-
helm repo add minio-new https://charts.min.io
158-
helm repo add jetstack https://charts.jetstack.io
159-
helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx
160-
161148
- name: Parse Chart.yaml
162149
id: parse-chart
163150
run: |
@@ -175,6 +162,21 @@ jobs:
175162
fi
176163
echo "packagename=${name}-${version}" >> $GITHUB_OUTPUT
177164
165+
- name: Add dependency chart repos
166+
run: |
167+
cd source
168+
# Skip the header line and make sure that tabs are expanded into spaces
169+
deps=$(helm dependency list "${{ steps.parse-chart.outputs.chartpath }}" | tail +2 | expand)
170+
while read -r row; do
171+
IFS=' ' read -ra parts <<< "$row"
172+
name="${parts[0]}"
173+
repo="${parts[2]}"
174+
case "$repo" in
175+
"https://"*) helm repo add "$name" "$repo" ;;
176+
*) echo >&2 "Skipping dependency $name: unsupported schema for \"$repo\"" ;;
177+
esac
178+
done <<< "$deps"
179+
178180
- name: Install CR tool
179181
run: |
180182
mkdir "${CR_TOOL_PATH}"

‎charts/agent-operator/Chart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: v2
22
name: grafana-agent-operator
33
description: A Helm chart for Grafana Agent Operator
44
type: application
5-
version: 0.3.21
6-
appVersion: "0.40.4"
7-
home: https://grafana.com/docs/agent/v0.40/
8-
icon: https://raw.githubusercontent.com/grafana/agent/v0.40.4/docs/sources/assets/logo_and_name.png
5+
version: 0.3.23
6+
appVersion: "0.41.0"
7+
home: https://grafana.com/docs/agent/v0.41/
8+
icon: https://raw.githubusercontent.com/grafana/agent/v0.41.0/docs/sources/assets/logo_and_name.png
99
sources:
10-
- https://github.com/grafana/agent/tree/v0.40.4/pkg/operator
10+
- https://github.com/grafana/agent/tree/v0.41.0/pkg/operator
1111
maintainers:
1212
- name: Grafana Agent Team
1313
email: grafana-agent-team@googlegroups.com

‎charts/agent-operator/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# grafana-agent-operator
22

3-
![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)
3+
![Version: 0.3.23](https://img.shields.io/badge/Version-0.3.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.0](https://img.shields.io/badge/AppVersion-0.41.0-informational?style=flat-square)
44

55
A Helm chart for Grafana Agent Operator
66

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

99
## Source Code
1010

11-
* <https://github.com/grafana/agent/tree/v0.40.4/pkg/operator>
11+
* <https://github.com/grafana/agent/tree/v0.41.0/pkg/operator>
1212

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

@@ -63,7 +63,7 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an
6363
| image.pullSecrets | list | `[]` | Image pull secrets |
6464
| image.registry | string | `"docker.io"` | Image registry |
6565
| image.repository | string | `"grafana/agent-operator"` | Image repo |
66-
| image.tag | string | `"v0.40.4"` | Image tag |
66+
| image.tag | string | `"v0.41.0"` | Image tag |
6767
| 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 |
6868
| nameOverride | string | `""` | Overrides the chart's name |
6969
| nodeSelector | object | `{}` | nodeSelector configuration |

‎charts/agent-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ image:
3737
# -- Image repo
3838
repository: grafana/agent-operator
3939
# -- Image tag
40-
tag: v0.40.4
40+
tag: v0.41.0
4141
# -- Image pull policy
4242
pullPolicy: IfNotPresent
4343
# -- Image pull secrets

‎charts/grafana/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: grafana
3-
version: 7.3.9
3+
version: 7.3.11
44
appVersion: 10.4.1
55
kubeVersion: "^1.8.0-0"
66
description: The leading tool for querying and visualizing time series and metrics.

‎charts/grafana/templates/_helpers.tpl

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,11 @@ Return the appropriate apiVersion for ingress.
145145
Return the appropriate apiVersion for Horizontal Pod Autoscaler.
146146
*/}}
147147
{{- define "grafana.hpa.apiVersion" -}}
148-
{{- if $.Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
149-
{{- print "autoscaling/v2" }}
150-
{{- else if $.Capabilities.APIVersions.Has "autoscaling/v2beta2/HorizontalPodAutoscaler" }}
151-
{{- print "autoscaling/v2beta2" }}
152-
{{- else }}
153-
{{- print "autoscaling/v2beta1" }}
154-
{{- end }}
148+
{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}
149+
{{- print "autoscaling/v2" }}
150+
{{- else }}
151+
{{- print "autoscaling/v2beta2" }}
152+
{{- end }}
155153
{{- end }}
156154
157155
{{/*

‎charts/grafana/templates/tests/test.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ spec:
4141
- mountPath: /tests
4242
name: tests
4343
readOnly: true
44+
{{- with .Values.testFramework.resources }}
45+
resources:
46+
{{- toYaml . | nindent 8 }}
47+
{{- end }}
4448
volumes:
4549
- name: tests
4650
configMap:

‎charts/grafana/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,13 @@ testFramework:
121121
tag: "v1.4.1"
122122
imagePullPolicy: IfNotPresent
123123
securityContext: {}
124+
resources: {}
125+
# limits:
126+
# cpu: 100m
127+
# memory: 128Mi
128+
# requests:
129+
# cpu: 100m
130+
# memory: 128Mi
124131

125132
# dns configuration for pod
126133
dnsPolicy: ~

‎charts/tempo-distributed/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: tempo-distributed
33
description: Grafana Tempo in MicroService mode
44
type: application
5-
version: 1.9.6
6-
appVersion: 2.4.1
5+
version: 1.10.0
6+
appVersion: 2.5.0
77
engine: gotpl
88
home: https://grafana.com/docs/tempo/latest/
99
icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png

‎charts/tempo-distributed/README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo-distributed
22

3-
![Version: 1.9.6](https://img.shields.io/badge/Version-1.9.6-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)
3+
![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
44

55
Grafana Tempo in MicroService mode
66

@@ -694,9 +694,7 @@ The memcached default args are removed and should be provided manually. The sett
694694
| queryFrontend.config.max_retries | int | `2` | Number of times to retry a request sent to a querier |
695695
| queryFrontend.config.search.concurrent_jobs | int | `1000` | The number of concurrent jobs to execute when searching the backend |
696696
| queryFrontend.config.search.target_bytes_per_job | int | `104857600` | The target number of bytes for each job to handle when performing a backend search |
697-
| queryFrontend.config.trace_by_id | object | `{"hedge_requests_at":"2s","hedge_requests_up_to":2,"query_shards":50}` | Trace by ID lookup configuration |
698-
| queryFrontend.config.trace_by_id.hedge_requests_at | string | `"2s"` | If set to a non-zero value, a second request will be issued at the provided duration. Recommended to be set to p99 of search requests to reduce long-tail latency. |
699-
| queryFrontend.config.trace_by_id.hedge_requests_up_to | int | `2` | The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set. Must be greater than 0. |
697+
| queryFrontend.config.trace_by_id | object | `{"query_shards":50}` | Trace by ID lookup configuration |
700698
| queryFrontend.config.trace_by_id.query_shards | int | `50` | The number of shards to split a trace by id query into. |
701699
| queryFrontend.extraArgs | list | `[]` | Additional CLI args for the query-frontend |
702700
| queryFrontend.extraEnv | list | `[]` | Environment variables to add to the query-frontend pods |
@@ -924,7 +922,7 @@ config: |
924922
backend: s3
925923
s3:
926924
access_key: tempo
927-
bucket: tempo
925+
bucket: <your s3 bucket>
928926
endpoint: minio:9000
929927
insecure: true
930928
secret_key: supersecret

‎charts/tempo-distributed/README.md.gotmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ config: |
323323
backend: s3
324324
s3:
325325
access_key: tempo
326-
bucket: tempo
326+
bucket: <your s3 bucket>
327327
endpoint: minio:9000
328328
insecure: true
329329
secret_key: supersecret

‎charts/tempo-distributed/templates/ingester/statefulset-ingester.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@ spec:
151151
{{- end }}
152152
{{- else }}
153153
volumeClaimTemplates:
154-
- metadata:
154+
- apiVersion: v1
155+
kind: PersistentVolumeClaim
156+
metadata:
155157
{{- with .Values.ingester.persistence.annotations }}
156158
annotations:
157159
{{- toYaml . | nindent 10 }}

‎charts/tempo-distributed/templates/metrics-generator/statefulset-metrics-generator.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,9 @@ spec:
140140
emptyDir: {{- toYaml .Values.metricsGenerator.walEmptyDir | nindent 12 }}
141141
{{- else }}
142142
volumeClaimTemplates:
143-
- metadata:
143+
- apiVersion: v1
144+
kind: PersistentVolumeClaim
145+
metadata:
144146
{{- with .Values.metricsGenerator.persistence.annotations }}
145147
annotations:
146148
{{- toYaml . | nindent 10 }}

‎charts/tempo-distributed/templates/tokengen/tokengen-job.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ spec:
1717
backoffLimit: 6
1818
completions: 1
1919
parallelism: 1
20-
selector:
21-
matchLabels:
22-
{{- include "tempo.selectorLabels" $dict | nindent 6 }}
2320
template:
2421
metadata:
2522
labels:

‎charts/tempo-distributed/values.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -723,10 +723,6 @@ queryFrontend:
723723
trace_by_id:
724724
# -- The number of shards to split a trace by id query into.
725725
query_shards: 50
726-
# -- If set to a non-zero value, a second request will be issued at the provided duration. Recommended to be set to p99 of search requests to reduce long-tail latency.
727-
hedge_requests_at: 2s
728-
# -- The maximum number of requests to execute when hedging. Requires hedge_requests_at to be set. Must be greater than 0.
729-
hedge_requests_up_to: 2
730726
autoscaling:
731727
# -- Enable autoscaling for the query-frontend
732728
enabled: false
@@ -1221,8 +1217,6 @@ config: |
12211217
concurrent_jobs: {{ .Values.queryFrontend.config.search.concurrent_jobs }}
12221218
trace_by_id:
12231219
query_shards: {{ .Values.queryFrontend.config.trace_by_id.query_shards }}
1224-
hedge_requests_at: {{ .Values.queryFrontend.config.trace_by_id.hedge_requests_at }}
1225-
hedge_requests_up_to: {{ .Values.queryFrontend.config.trace_by_id.hedge_requests_up_to }}
12261220
12271221
ingester:
12281222
lifecycler:
@@ -1836,6 +1830,10 @@ gateway:
18361830
proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces;
18371831
}
18381832
1833+
location = /otlp/v1/traces {
1834+
proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "distributor") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:4318/v1/traces;
1835+
}
1836+
18391837
location ^~ /api {
18401838
proxy_pass http://{{ include "tempo.resourceName" (dict "ctx" . "component" "query-frontend") }}.{{ .Release.Namespace }}.svc.{{ .Values.global.clusterDomain }}:3100$request_uri;
18411839
}

‎charts/tempo/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: tempo
33
description: Grafana Tempo Single Binary Mode
44
type: application
5-
version: 1.8.0
6-
appVersion: 2.3.1
5+
version: 1.10.0
6+
appVersion: 2.5.0
77
engine: gotpl
88
home: https://grafana.net
99
icon: https://raw.githubusercontent.com/grafana/tempo/master/docs/tempo/website/logo_and_name.png

‎charts/tempo/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tempo
22

3-
![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.1](https://img.shields.io/badge/AppVersion-2.3.1-informational?style=flat-square)
3+
![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square)
44

55
Grafana Tempo Single Binary Mode
66

‎charts/tempo/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ tempo:
6969
# backend: s3
7070
# store traces in s3
7171
# s3:
72-
# bucket: tempo # store traces in this bucket
72+
# bucket: <your s3 bucket> # store traces in this bucket
7373
# endpoint: s3.dualstack.us-east-2.amazonaws.com # api endpoint
7474
# access_key: ... # optional. access key when using static credentials.
7575
# secret_key: ... # optional. secret key when using static credentials.

0 commit comments

Comments
 (0)