Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[opentelemetry-integration] update collector to 115 and TA to 114 #480

Merged
merged 1 commit into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion otel-integration/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

## OpenTelemtry-Integration

### v0.0.118 / 2024-12-05
### v0.0.120 / 2024-12-05
- [Feat] Bump collector version to `0.115.0`
- [Feat] Bump Target Allocator version to `0.114.0`

### v0.0.119 / 2024-12-05
- [Fix] Target Allocator configmap name conflicting with collector configmap.

### v0.0.118 / 2024-12-04
Expand Down
12 changes: 6 additions & 6 deletions otel-integration/k8s-helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: otel-integration
description: OpenTelemetry Integration
version: 0.0.119
version: 0.0.120
keywords:
- OpenTelemetry Collector
- OpenTelemetry Agent
Expand All @@ -11,27 +11,27 @@ keywords:
dependencies:
- name: opentelemetry-collector
alias: opentelemetry-agent
version: "0.98.7"
version: "0.99.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-agent.enabled
- name: opentelemetry-collector
alias: opentelemetry-agent-windows
version: "0.98.7"
version: "0.99.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-agent-windows.enabled
- name: opentelemetry-collector
alias: opentelemetry-cluster-collector
version: "0.98.7"
version: "0.99.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-cluster-collector.enabled
- name: opentelemetry-collector
alias: opentelemetry-receiver
version: "0.98.7"
version: "0.99.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-receiver.enabled
- name: opentelemetry-collector
alias: opentelemetry-gateway
version: "0.98.7"
version: "0.99.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-gateway.enabled
- name: coralogix-ebpf-agent
Expand Down
2 changes: 1 addition & 1 deletion otel-integration/k8s-helm/e2e-test/expected_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var expectedSchemaURL = map[string]bool{
"https://opentelemetry.io/schemas/1.9.0": false,
}

const expectedScopeVersion = "0.111.0"
const expectedScopeVersion = "0.115.0"

var expectedScopeNames = map[string]bool{
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/networkscraper": false,
Expand Down
12 changes: 2 additions & 10 deletions otel-integration/k8s-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ global:
defaultSubsystemName: "integration"
logLevel: "warn"
collectionInterval: "30s"
version: "0.0.119"
version: "0.0.120"

extensions:
kubernetesDashboard:
Expand Down Expand Up @@ -58,12 +58,10 @@ opentelemetry-agent:
scrapeInterval: 30s
image:
repository: ghcr.io/open-telemetry/opentelemetry-operator/target-allocator
tag: v0.105.0
tag: v0.114.0

# Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information.
command:
name: otelcol-contrib
extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost"]

serviceAccount:
# Specifies whether a service account should be created
Expand Down Expand Up @@ -447,10 +445,8 @@ opentelemetry-cluster-collector:
kubernetesResources:
enabled: false

# Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information.
command:
name: otelcol-contrib
extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost"]

extraEnvs:
- name: CORALOGIX_PRIVATE_KEY
Expand Down Expand Up @@ -751,10 +747,8 @@ opentelemetry-gateway:
enabled: true
clusterName: "{{.Values.global.clusterName}}"
integrationName: "coralogix-integration-helm"
# Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information.
command:
name: otelcol-contrib
extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost"]

config:
extensions:
Expand Down Expand Up @@ -946,10 +940,8 @@ opentelemetry-receiver:
enabled: true
clusterName: "{{.Values.global.clusterName}}"
integrationName: "coralogix-integration-helm"
# Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information.
command:
name: otelcol-contrib
extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost"]

config:
extensions:
Expand Down
Loading