diff --git a/Makefile b/Makefile index 70e29bed..6d2c0f2b 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ OTELCOL_BUILDER_VERSION ?= 0.96.0 OTELCOL_BUILDER_DIR ?= ${HOME}/bin OTELCOL_BUILDER ?= ${OTELCOL_BUILDER_DIR}/ocb -DISTRIBUTIONS ?= "otelcol,otelcol-contrib,otelcol-k8s" +DISTRIBUTIONS ?= "otelcol,otelcol-contrib" ci: check build check: ensure-goreleaser-up-to-date diff --git a/distributions/otelcol-k8s/.goreleaser.yaml b/distributions/otelcol-k8s/.goreleaser.yaml index 62ff655d..992c5335 100644 --- a/distributions/otelcol-k8s/.goreleaser.yaml +++ b/distributions/otelcol-k8s/.goreleaser.yaml @@ -6,31 +6,12 @@ env: builds: - id: otelcol-k8s goos: - - darwin - linux - - windows goarch: - - "386" - amd64 - - arm - arm64 - ppc64le - s390x - goarm: - - "7" - ignore: - - goos: darwin - goarch: "386" - - goos: darwin - goarch: arm - - goos: darwin - goarch: s390x - - goos: windows - goarch: arm - - goos: windows - goarch: arm64 - - goos: windows - goarch: s390x dir: _build binary: otelcol-k8s ldflags: @@ -45,53 +26,9 @@ archives: builds: - otelcol-k8s name_template: '{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}' -nfpms: - - package_name: otelcol-k8s - contents: - - src: otelcol-k8s.service - dst: /lib/systemd/system/otelcol-k8s.service - - src: otelcol-k8s.conf - dst: /etc/otelcol-k8s/otelcol-k8s.conf - type: config|noreplace - - src: config.yaml - dst: /etc/otelcol-k8s/config.yaml - type: config - scripts: - preinstall: preinstall.sh - postinstall: postinstall.sh - preremove: preremove.sh - id: otelcol-k8s - builds: - - otelcol-k8s - formats: - - apk - - deb - - rpm - maintainer: The OpenTelemetry Collector maintainers - description: OpenTelemetry Collector - otelcol-k8s - license: Apache 2.0 checksum: name_template: '{{ .ProjectName }}_otelcol-k8s_checksums.txt' dockers: - - goos: linux - goarch: "386" - dockerfile: Dockerfile - image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-386 - - otel/opentelemetry-collector-k8s:latest-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-386 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-386 - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --platform=linux/386 - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - use: buildx - goos: linux goarch: amd64 dockerfile: Dockerfile @@ -111,26 +48,6 @@ dockers: - --label=org.opencontainers.image.version={{.Version}} - --label=org.opencontainers.image.source={{.GitURL}} use: buildx - - goos: linux - goarch: arm - goarm: "7" - dockerfile: Dockerfile - image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-armv7 - - otel/opentelemetry-collector-k8s:latest-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-armv7 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-armv7 - extra_files: - - config.yaml - build_flag_templates: - - --pull - - --platform=linux/arm/v7 - - --label=org.opencontainers.image.created={{.Date}} - - --label=org.opencontainers.image.name={{.ProjectName}} - - --label=org.opencontainers.image.revision={{.FullCommit}} - - --label=org.opencontainers.image.version={{.Version}} - - --label=org.opencontainers.image.source={{.GitURL}} - use: buildx - goos: linux goarch: arm64 dockerfile: Dockerfile @@ -191,33 +108,25 @@ dockers: docker_manifests: - name_template: otel/opentelemetry-collector-k8s:{{ .Version }} image_templates: - - otel/opentelemetry-collector-k8s:{{ .Version }}-386 - otel/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - otel/opentelemetry-collector-k8s:{{ .Version }}-armv7 - otel/opentelemetry-collector-k8s:{{ .Version }}-arm64 - otel/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - otel/opentelemetry-collector-k8s:{{ .Version }}-s390x - name_template: otel/opentelemetry-collector-k8s:latest image_templates: - - otel/opentelemetry-collector-k8s:latest-386 - otel/opentelemetry-collector-k8s:latest-amd64 - - otel/opentelemetry-collector-k8s:latest-armv7 - otel/opentelemetry-collector-k8s:latest-arm64 - otel/opentelemetry-collector-k8s:latest-ppc64le - otel/opentelemetry-collector-k8s:latest-s390x - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }} image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-386 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-armv7 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-arm64 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-ppc64le - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-s390x - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest image_templates: - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-386 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-amd64 - - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-armv7 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-arm64 - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-ppc64le - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:latest-s390x diff --git a/distributions/otelcol-k8s/otelcol-k8s.service b/distributions/otelcol-k8s/otelcol-k8s.service deleted file mode 100644 index 73873edf..00000000 --- a/distributions/otelcol-k8s/otelcol-k8s.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=OpenTelemetry Collector k8s -After=network.target - -[Service] -EnvironmentFile=/etc/otelcol-k8s/otelcol-k8s.conf -ExecStart=/usr/bin/otelcol-k8s $OTELCOL_OPTIONS -KillMode=mixed -Restart=on-failure -Type=simple -User=otelcol-k8s -Group=otelcol-k8s - -[Install] -WantedBy=multi-user.target diff --git a/distributions/otelcol-k8s/postinstall.sh b/distributions/otelcol-k8s/postinstall.sh deleted file mode 100755 index 71b906af..00000000 --- a/distributions/otelcol-k8s/postinstall.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# Copyright The OpenTelemetry Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if command -v systemctl >/dev/null 2>&1; then - systemctl enable otelcol-k8s.service - if [ -f /etc/otelcol-k8s/config.yaml ]; then - systemctl start otelcol-k8s.service - fi -fi diff --git a/distributions/otelcol-k8s/preinstall.sh b/distributions/otelcol-k8s/preinstall.sh deleted file mode 100755 index 553f0ae4..00000000 --- a/distributions/otelcol-k8s/preinstall.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# Copyright The OpenTelemetry Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -getent passwd otelcol-k8s >/dev/null || useradd --system --user-group --no-create-home --shell /sbin/nologin otelcol-k8s diff --git a/distributions/otelcol-k8s/preremove.sh b/distributions/otelcol-k8s/preremove.sh deleted file mode 100755 index 7e1e2723..00000000 --- a/distributions/otelcol-k8s/preremove.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# Copyright The OpenTelemetry Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if command -v systemctl >/dev/null 2>&1; then - systemctl stop otelcol-k8s.service - systemctl disable otelcol-k8s.service -fi