Remove default config

open-telemetry · Mar 28, 2024 · e9326b9 · e9326b9
1 parent f48433f
commit e9326b9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 46 deletions.
diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml
@@ -37,8 +37,6 @@ dockers:
       - otel/opentelemetry-collector-k8s:latest-amd64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-amd64
-    extra_files:
-      - config.yaml
     build_flag_templates:
       - --pull
       - --platform=linux/amd64
@@ -56,8 +54,6 @@ dockers:
       - otel/opentelemetry-collector-k8s:latest-arm64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-arm64
-    extra_files:
-      - config.yaml
     build_flag_templates:
       - --pull
       - --platform=linux/arm64
@@ -75,8 +71,6 @@ dockers:
       - otel/opentelemetry-collector-k8s:latest-ppc64le
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-ppc64le
-    extra_files:
-      - config.yaml
     build_flag_templates:
       - --pull
       - --platform=linux/ppc64le
@@ -94,8 +88,6 @@ dockers:
       - otel/opentelemetry-collector-k8s:latest-s390x
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x
       - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-s390x
-    extra_files:
-      - config.yaml
     build_flag_templates:
       - --pull
       - --platform=linux/s390x

diff --git a/distributions/otelcol-k8s/Dockerfile b/distributions/otelcol-k8s/Dockerfile
@@ -10,7 +10,6 @@ COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifica
 COPY --chmod=755 otelcol-k8s /otelcol-k8s
 COPY config.yaml /etc/otelcol-k8s/config.yaml
 ENTRYPOINT ["/otelcol-k8s"]
-CMD ["--config", "/etc/otelcol-k8s/config.yaml"]
 # `4137` and `4318`: OTLP
 # `55678`: OpenCensus
 # `55679`: zpages

diff --git a/distributions/otelcol-k8s/config.yaml b/distributions/otelcol-k8s/config.yaml