Skip to content

Commit 1c6538c

Browse files
author
Naseem
authored
Update otel-collector to 0.19.0 (open-telemetry#28)
Also removed removed queued_retry. Signed-off-by: naseemkullah [email protected]
1 parent 4a22d04 commit 1c6538c

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

.github/workflows/lint-test.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7+
78
jobs:
89
lint-test:
910
runs-on: ubuntu-latest
@@ -16,7 +17,7 @@ jobs:
1617
- name: Set up Helm
1718
uses: azure/setup-helm@v1
1819
with:
19-
version: v3.4.0
20+
version: v3.4.1
2021

2122
- uses: actions/setup-python@v2
2223
with:
@@ -37,9 +38,8 @@ jobs:
3738
run: ct lint --target-branch main
3839

3940
- name: Create kind cluster
40-
uses: helm/[email protected]
41-
# Only build a kind cluster if there are chart changes to test.
42-
if: steps.lint.outputs.changed == 'true'
41+
uses: helm/[email protected]
42+
if: steps.list-changed.outputs.changed == 'true'
4343

4444
- name: Run chart-testing (install)
4545
run: ct install --target-branch main

.github/workflows/release.yaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@ jobs:
1818
run: |
1919
git config user.name "$GITHUB_ACTOR"
2020
git config user.email "[email protected]"
21-
# See https://github.com/helm/chart-releaser-action/issues/6
21+
2222
- name: Install Helm
23-
run: |
24-
curl -fsSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
25-
chmod 700 get_helm.sh
26-
./get_helm.sh
23+
uses: azure/setup-helm@v1
24+
with:
25+
version: v3.4.1
26+
2727
- name: Run chart-releaser
28-
uses: helm/[email protected]
28+
uses: helm/[email protected]
29+
with:
30+
charts_dir: charts
31+
config: cr.yaml
2932
env:
3033
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

charts/opentelemetry-collector/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.3.1
3+
version: 0.4.0
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/
@@ -13,4 +13,4 @@ maintainers:
1313
- name: pjanotti
1414
- name: tigrannajaryan
1515
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
16-
appVersion: 0.11.0
16+
appVersion: 0.19.0

charts/opentelemetry-collector/values.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ config:
1414
batch: {}
1515
# If set to null, will be overridden with values based on k8s resource limits
1616
memory_limiter: null
17-
queued_retry: {}
1817
receivers:
1918
jaeger:
2019
protocols:
@@ -46,7 +45,6 @@ config:
4645
processors:
4746
- memory_limiter
4847
- batch
49-
- queued_retry
5048
receivers:
5149
- otlp
5250
- prometheus
@@ -56,7 +54,6 @@ config:
5654
processors:
5755
- memory_limiter
5856
- batch
59-
- queued_retry
6057
receivers:
6158
- otlp
6259
- jaeger

0 commit comments

Comments
 (0)