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

release: prepare for v0.112.0 #88

Merged
merged 1 commit into from
Oct 31, 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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ endif

.PHONY: install-deps
install-deps: ## Install dependencies into the actual K8s cluster
kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.104.0/opentelemetry-operator.yaml
kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.112.0/opentelemetry-operator.yaml

.PHONY: install
install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/
```

```sh
kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.104.0/opentelemetry-operator.yaml
kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/download/v0.112.0/opentelemetry-operator.yaml
# Wait for the opentelemtry-operator to be running
kubectl wait --namespace opentelemetry-operator-system --for=condition=available deployment/opentelemetry-operator-controller-manager --timeout=300s
```
Expand Down
6 changes: 3 additions & 3 deletions charts/telemetry-controller/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: opentelemetry-operator
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
version: 0.68.1
digest: sha256:39aeb55ab857b7c6aed36ed56825444dd8143b772288c7dcfeb4227cd19d6461
generated: "2024-09-02T16:06:49.084247+02:00"
version: 0.71.2
digest: sha256:6efac07db29875478975c9de3777e8cb34972d1b3985d0d8efefc6a13220553a
generated: "2024-10-30T16:02:03.635547+01:00"
2 changes: 1 addition & 1 deletion charts/telemetry-controller/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ appVersion: latest

dependencies:
- name: opentelemetry-operator
version: 0.68.1
version: 0.71.2
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/examples/simple-demo-with-secretref/receiver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: receiver-otelcol
namespace: receiver
spec:
image: otel/opentelemetry-collector-contrib:0.104.0
image: otel/opentelemetry-collector-contrib:0.112.0
volumes:
- name: certs-volume
secret:
Expand Down
7 changes: 5 additions & 2 deletions internal/controller/telemetry/collector_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ import (
"github.com/kube-logging/telemetry-controller/api/telemetry/v1alpha1"
)

const requeueDelayOnFailedTenant = 20 * time.Second
const (
requeueDelayOnFailedTenant = 20 * time.Second
axoflowOtelCollectorImageRef = "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.112.0"
)

// CollectorReconciler reconciles a Collector object
type CollectorReconciler struct {
Expand Down Expand Up @@ -208,7 +211,7 @@ func (r *CollectorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
Config: otelConfig,
Mode: otelv1beta1.ModeDaemonSet,
OpenTelemetryCommonFields: otelv1beta1.OpenTelemetryCommonFields{
Image: "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.104.0-2",
Image: axoflowOtelCollectorImageRef,
ServiceAccount: saName.Name,
VolumeMounts: []corev1.VolumeMount{
{
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/telemetry/envtest_testdata/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ receivers:
type: move
start_at: end
exporters:
logging/debug:
debug:
verbosity: detailed
otlp/collector_otlp-test-output:
endpoint: receiver-collector.example-tenant-ns.svc.cluster.local:4317
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/telemetry/otel_conf_gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func (cfgInput *OtelColConfigInput) generateExporters(ctx context.Context) map[s
maps.Copy(exporters, cfgInput.generateOTLPGRPCExporters(ctx))
maps.Copy(exporters, cfgInput.generateOTLPHTTPExporters(ctx))
maps.Copy(exporters, cfgInput.generateFluentforwardExporters(ctx))
exporters["logging/debug"] = map[string]any{
exporters["debug"] = map[string]any{
"verbosity": "detailed",
}
return exporters
Expand Down Expand Up @@ -765,7 +765,7 @@ func (cfgInput *OtelColConfigInput) generateNamedPipelines() map[string]*otelv1b
exporters = []string{GetExporterNameForOutput(output.Output), outputCountConnectorName}
}
if cfgInput.Debug {
exporters = append(exporters, "logging/debug")
exporters = append(exporters, "debug")
}

namedPipelines[outputPipelineName] = generatePipeline(receivers, processors, exporters)
Expand Down
Loading