prepare-release: v0.112.0

Signed-off-by: Bence Csati <bence.csati@axoflow.com>
kube-logging · Oct 30, 2024 · 2a92001 · 2a92001
1 parent 610fb7a
commit 2a92001
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -177,7 +177,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.

diff --git a/README.md b/README.md
@@ -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
 ```

diff --git a/charts/telemetry-controller/Chart.lock b/charts/telemetry-controller/Chart.lock
@@ -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"
diff --git a/charts/telemetry-controller/Chart.yaml b/charts/telemetry-controller/Chart.yaml
@@ -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
diff --git a/charts/telemetry-controller/charts/opentelemetry-operator-0.68.1.tgz b/charts/telemetry-controller/charts/opentelemetry-operator-0.68.1.tgz
diff --git a/charts/telemetry-controller/charts/opentelemetry-operator-0.71.2.tgz b/charts/telemetry-controller/charts/opentelemetry-operator-0.71.2.tgz
diff --git a/docs/examples/simple-demo-with-secretref/receiver.yaml b/docs/examples/simple-demo-with-secretref/receiver.yaml
@@ -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:

diff --git a/internal/controller/telemetry/collector_controller.go b/internal/controller/telemetry/collector_controller.go
@@ -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 {
@@ -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{
 					{

diff --git a/internal/controller/telemetry/envtest_testdata/config.yaml b/internal/controller/telemetry/envtest_testdata/config.yaml
@@ -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

diff --git a/internal/controller/telemetry/otel_conf_gen.go b/internal/controller/telemetry/otel_conf_gen.go
@@ -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
@@ -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)