fix(logs): updates Docker build (#1366)

* fix(logs): updates builder-config

---------

Signed-off-by: Simon Olander <[email protected]>

* fix(logs): removes usermod for k8s

---------

Signed-off-by: Simon Olander <[email protected]>

* fix(logs): removes all user specifics

---------

Signed-off-by: Simon Olander <[email protected]>

* chore(logs): bump version

---------

Signed-off-by: Simon Olander <[email protected]>

---------

Signed-off-by: Simon Olander <[email protected]>

Author: olandr

logs/README.md

@@ -83,9 +83,9 @@ The **Logs** Plugin comes with a [Failover Connector](https://github.com/open-te
 | commonLabels | object | `{}` | common labels to apply to all resources. |
 | customCRDs.enabled | bool | `true` | The required CRDs used by this dependency are version-controlled in this repository under ./charts/crds.  |
 | openTelemetry.cluster | string | `nil` | Cluster label for Logging |
-| openTelemetry.collectorImage | object | `{"repository":"ghcr.io/cloudoperators/opentelemetry-collector-contrib","tag":"a2ad27b"}` | OpenTelemetry Collector image configuration |
+| openTelemetry.collectorImage | object | `{"repository":"ghcr.io/cloudoperators/opentelemetry-collector-contrib","tag":"cacb425"}` | OpenTelemetry Collector image configuration |
 | openTelemetry.collectorImage.repository | string | `"ghcr.io/cloudoperators/opentelemetry-collector-contrib"` | Image repository for OpenTelemetry Collector |
-| openTelemetry.collectorImage.tag | string | `"a2ad27b"` | Image tag for OpenTelemetry Collector |
+| openTelemetry.collectorImage.tag | string | `"cacb425"` | Image tag for OpenTelemetry Collector |
 | openTelemetry.customLabels | object | `{}` | custom Labels applied to servicemonitor, secrets and collectors |
 | openTelemetry.logsCollector.cephConfig | object | `{"enabled":false}` | Activates the configuration for Ceph logs (requires logsCollector to be enabled). |
 | openTelemetry.logsCollector.enabled | bool | `true` | Activates the standard configuration for Logs. |

logs/build/Dockerfile

@@ -19,11 +19,4 @@ RUN apt-get update && \
 COPY --from=build /go/dist/otelcol /usr/local/bin/otelcol
 RUN chmod +x /usr/local/bin/otelcol
 
-RUN groupadd --system --gid 10001 otel && \
-useradd --system --uid 10001 --gid otel otel
-
-RUN usermod -aG systemd-journal otel
-
-USER otel
-
 ENTRYPOINT ["/usr/local/bin/otelcol"]

logs/build/otel-collector-builder-config.yaml

@@ -19,7 +19,8 @@ processors:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.143.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.143.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.143.0
-
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.143.0
+ 
 providers:
   - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.49.0
   - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.49.0
@@ -37,6 +38,7 @@ connectors:
 
 extensions:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.143.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.143.0
 
 exporters:
   - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.143.0

logs/charts/Chart.yaml

@@ -3,7 +3,7 @@
 
 apiVersion: v2
 name: logs
-version: 0.0.12
+version: 0.0.13
 description: OpenTelemetry Operator Helm chart for Kubernetes
 icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
 type: application

logs/charts/values.yaml

@@ -50,7 +50,7 @@ openTelemetry:
     # -- Image repository for OpenTelemetry Collector
     repository: ghcr.io/cloudoperators/opentelemetry-collector-contrib
     # -- Image tag for OpenTelemetry Collector
-    tag: "a2ad27b"
+    tag: "cacb425"
 
   # -- custom Labels applied to servicemonitor, secrets and collectors
   customLabels: {}

logs/plugindefinition.yaml

@@ -6,14 +6,14 @@ kind: PluginDefinition
 metadata:
   name: logs
 spec:
-  version: 0.11.23
+  version: 0.11.24
   displayName: Logs
   description: Observability framework for instrumenting, generating, collecting, and exporting logs.
   icon: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/logs/logo.png
   helmChart:
     name: logs
     repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
-    version: 0.0.12
+    version: 0.0.13
   options:
     - default: true
       description: Set to true to enable the installation of the OpenTelemetry Operator.