Skip to content

Commit

Permalink
Merge branch 'main' into codeboten/prom-use-readers
Browse files Browse the repository at this point in the history
  • Loading branch information
codeboten authored Oct 1, 2024
2 parents e4adb40 + b7407c4 commit a650880
Show file tree
Hide file tree
Showing 130 changed files with 792 additions and 479 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/operator-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
git clone -b v"$appVersion" --single-branch https://github.com/open-telemetry/opentelemetry-operator.git ./opentelemetry-operator
- name: Install chainsaw
uses: kyverno/[email protected].9
uses: kyverno/[email protected].10

- name: Install metrics-server
run: |
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
git clone -b v"$appVersion" --single-branch https://github.com/open-telemetry/opentelemetry-operator.git ./opentelemetry-operator
- name: Install chainsaw
uses: kyverno/[email protected].9
uses: kyverno/[email protected].10

- name: Install metrics-server
run: |
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.104.0
version: 0.107.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -12,4 +12,4 @@ maintainers:
- name: jaronoff97
- name: TylerHelmuth
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
appVersion: 0.108.0
appVersion: 0.110.0
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Just upgrade and enjoy.
> [!WARNING]
> Critical content demanding immediate user attention due to potential risks.
The deprecated memory ballast extension has been removed from the default config. If you depend on this component you must manually configure `config.exentions` and `config.service.extensions` to include the memory ballast extension. Setting `useGOMEMLIMIT` to `false` will no longer keep the memory ballast extension in the rendered collector config.
The deprecated memory ballast extension has been removed from the default config. If you depend on this component you must manually configure `config.extensions` and `config.service.extensions` to include the memory ballast extension. Setting `useGOMEMLIMIT` to `false` will no longer keep the memory ballast extension in the rendered collector config.

## 0.88.0 to 0.89.0

Expand Down
10 changes: 10 additions & 0 deletions charts/opentelemetry-collector/ci/probes-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,13 @@ readinessProbe:
httpGet:
port: 8989
path: /healthz

startupProbe:
initialDelaySeconds: 10
periodSeconds: 5
timeoutSeconds: 3
failureThreshold: 10
terminationGracePeriodSeconds: 40
httpGet:
port: 8989
path: /healthz
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

roleRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

spec:
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b9ee8f766c36fa6c45f49fdc4a2d4107c8afcd5faf20ab829f12b54d12dde201
checksum/config: b59255f59776bc33cdc8cec11469e415052e121c6097ca659cdda696202302c9

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -45,7 +45,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.108.0"
image: "otel/opentelemetry-collector-k8s:0.110.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

component: standalone-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 885667b513b9bf70dba20a85fc7d3d8fe2d81f6d9c5a0e7bb9be12bfeb37fc8f
checksum/config: 6e843d5f37494e4c76040246c70126f9f48298504862cddc2b995d203e2cde05

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -43,7 +43,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.108.0"
image: "otel/opentelemetry-collector-k8s:0.110.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

spec:
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 9e8cb877b7d9067b4e70fcd59d275effd0d698ca0ce187a7f416acc0ca74efb6
checksum/config: 1d9b672e15b1e3dc257e79561b839026320701442d7cac2dbb43cf97ce93fc9c

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -45,7 +45,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.108.0"
image: "otel/opentelemetry-collector-k8s:0.110.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

component: standalone-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 503472364f1736c3a4e4b54b00eda70e75429f9570783b89ee2394aade71055c
checksum/config: 6e4750252406892037bc4bf92dcdc69bdc19dfd0efd4e63b72c34bd709c561fb

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -43,7 +43,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.108.0"
image: "otel/opentelemetry-collector-k8s:0.110.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: db63ebb2d34e12be8bd9865848567b85863c57038e15ba7b88938b673aacd20b
checksum/config: e054776ed7a402fe03641932845229d191b8b79d73e94b28f8c767defca2a414

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -43,7 +43,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.108.0"
image: "otel/opentelemetry-collector-k8s:0.110.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.104.0
helm.sh/chart: opentelemetry-collector-0.107.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.108.0"
app.kubernetes.io/version: "0.110.0"
app.kubernetes.io/managed-by: Helm

data:
Expand Down
Loading

0 comments on commit a650880

Please sign in to comment.