Skip to content

Commit

Permalink
PVCORE-4435 - Move otel image to Quay. Pin versions of image and chart (
Browse files Browse the repository at this point in the history
  • Loading branch information
mike-kingsbury authored Aug 19, 2024
1 parent 099e315 commit a301c47
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
# Chart from OTel Project
- chart: opentelemetry-collector
repoURL: https://open-telemetry.github.io/opentelemetry-helm-charts
targetRevision: 0.90.1
targetRevision: 0.101.2
helm:
parameters:
- name: "image.repository"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ config:
# Without the health_check extension the collector will fail the readiness and liveliness probes.
# The health_check extension can be modified, but should never be removed.
health_check: {}
memory_ballast: {}
processors:
batch: {}
# If set to null, will be overridden with values based on k8s resource limits
memory_limiter:
check_interval: 2s
limit_mib: 512
spike_limit_percentage: 100
limit_percentage: 95
spike_limit_percentage: 90
attributes/collector-info:
actions:
- key: collector.hostname
Expand All @@ -41,7 +41,6 @@ config:
service:
extensions:
- health_check
- memory_ballast
pipelines:
traces:
exporters:
Expand Down Expand Up @@ -76,4 +75,9 @@ ports:
enabled: false
zipkin:
enabled: false
image:
repository: quay.io/konflux-ci/opentelemetry-collector-k8s
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "0.106.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ config:
# Without the health_check extension the collector will fail the readiness and liveliness probes.
# The health_check extension can be modified, but should never be removed.
health_check: {}
memory_ballast: {}
processors:
batch: {}
# If set to null, will be overridden with values based on k8s resource limits
memory_limiter:
check_interval: 2s
limit_mib: 512
spike_limit_percentage: 100
limit_percentage: 95
spike_limit_percentage: 90
attributes/collector-info:
actions:
- key: collector.hostname
Expand All @@ -39,7 +39,6 @@ config:
service:
extensions:
- health_check
- memory_ballast
pipelines:
traces:
exporters:
Expand Down Expand Up @@ -80,4 +79,8 @@ extraEnvs:
secretKeyRef:
name: "honeycomb-api-key"
key: konflux-tracing-prod

image:
repository: quay.io/konflux-ci/opentelemetry-collector-k8s
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "0.106.0"
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ config:
# Without the health_check extension the collector will fail the readiness and liveliness probes.
# The health_check extension can be modified, but should never be removed.
health_check: {}
memory_ballast: {}
processors:
batch: {}
# If set to null, will be overridden with values based on k8s resource limits
memory_limiter:
check_interval: 2s
limit_mib: 512
spike_limit_percentage: 100
limit_percentage: 95
spike_limit_percentage: 90
attributes/collector-info:
actions:
- key: collector.hostname
Expand All @@ -39,7 +39,6 @@ config:
service:
extensions:
- health_check
- memory_ballast
pipelines:
traces:
exporters:
Expand Down Expand Up @@ -80,3 +79,8 @@ extraEnvs:
secretKeyRef:
name: "honeycomb-api-key"
key: konflux-tracing-stage
image:
repository: quay.io/konflux-ci/opentelemetry-collector-k8s
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "0.106.0"

0 comments on commit a301c47

Please sign in to comment.