re-adding linux/ppc64le support (open-telemetry#173)

* re-adding linux/ppc64le support * documenting how to add new platform/arch in CI * Improved contributing section on adding new platforms/arches Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de> Co-authored-by: Juraci Paixão Kröhling <juraci@kroehling.de>
cpanato · Aug 2, 2022 · 58cf063 · 58cf063
1 parent 4a2af33
commit 58cf063
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 3 deletions.
diff --git a/.github/workflows/ci-goreleaser.yaml b/.github/workflows/ci-goreleaser.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup QEMU
         uses: docker/setup-qemu-action@v2
         with:
-          platforms: arm64
+          platforms: arm64,ppc64le
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Setup QEMU
         uses: docker/setup-qemu-action@v2
         with:
-          platforms: arm64
+          platforms: arm64,ppc64le
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v2

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -9,6 +9,7 @@ builds:
   - "386"
   - amd64
   - arm64
+  - ppc64le
   ignore:
   - goos: darwin
     goarch: "386"
@@ -32,6 +33,7 @@ builds:
   - "386"
   - amd64
   - arm64
+  - ppc64le
   ignore:
   - goos: darwin
     goarch: "386"
@@ -163,6 +165,24 @@ dockers:
   - --label=org.opencontainers.image.version={{.Version}}
   - --label=org.opencontainers.image.source={{.GitURL}}
   use: buildx
+- goos: linux
+  goarch: ppc64le
+  dockerfile: distributions/otelcol/Dockerfile
+  image_templates:
+  - otel/opentelemetry-collector:{{ .Version }}-ppc64le
+  - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{
+    .Version }}-ppc64le
+  extra_files:
+  - configs/otelcol.yaml
+  build_flag_templates:
+  - --pull
+  - --platform=linux/ppc64le
+  - --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: "386"
   dockerfile: distributions/otelcol-contrib/Dockerfile
@@ -217,12 +237,31 @@ dockers:
   - --label=org.opencontainers.image.version={{.Version}}
   - --label=org.opencontainers.image.source={{.GitURL}}
   use: buildx
+- goos: linux
+  goarch: ppc64le
+  dockerfile: distributions/otelcol-contrib/Dockerfile
+  image_templates:
+  - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
+  - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{
+    .Version }}-ppc64le
+  extra_files:
+  - configs/otelcol-contrib.yaml
+  build_flag_templates:
+  - --pull
+  - --platform=linux/ppc64le
+  - --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
 docker_manifests:
 - name_template: otel/opentelemetry-collector:{{ .Version }}
   image_templates:
   - otel/opentelemetry-collector:{{ .Version }}-386
   - otel/opentelemetry-collector:{{ .Version }}-amd64
   - otel/opentelemetry-collector:{{ .Version }}-arm64
+  - otel/opentelemetry-collector:{{ .Version }}-ppc64le
 - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{
     .Version }}
   image_templates:
@@ -232,11 +271,14 @@ docker_manifests:
     .Version }}-amd64
   - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{
     .Version }}-arm64
+  - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{
+    .Version }}-ppc64le
 - name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
   image_templates:
   - otel/opentelemetry-collector-contrib:{{ .Version }}-386
   - otel/opentelemetry-collector-contrib:{{ .Version }}-amd64
   - otel/opentelemetry-collector-contrib:{{ .Version }}-arm64
+  - otel/opentelemetry-collector-contrib:{{ .Version }}-ppc64le
 - name_template: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{
     .Version }}
   image_templates:
@@ -246,3 +288,5 @@ docker_manifests:
     .Version }}-amd64
   - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{
     .Version }}-arm64
+  - ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{
+    .Version }}-ppc64le
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -63,3 +63,13 @@ This is accomplished by installing [qemu](https://www.qemu.org/), and then [enab
 apt-get install qemu binfmt-support qemu-user-static
 docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 ```
+
+### Adding support for new platforms or architectures
+
+When a new collector distribution image or binary is needed in a different platform or architecture, the following should be considered:
+
+1. Add the new platform or architecture to the Continuous Integration test matrix for both the [core](https://github.com/open-telemetry/opentelemetry-collector) and [contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib) repositories, to ensure they can be compiled with the new combination. Failing to do so will eventually cause the release to fail due to compilation failures on those uncovered platforms, resulting in them being removed from the release matrix.
+2. In the `goreleaser/configure.go` file, add the new platform or architecture
+3. Regenerate the `.goreleaser` (see [goreleaser](#goreleaser) above)
+4. In the `.github/workflows/ci-goreleaser.yaml` file, under the "Setup QEMU" action, add the new platform and architecture
+5. In the `.github/workflows/release.yaml` file, under the "Setup QEMU" action, add the new platform and architecture
diff --git a/goreleaser/configure.go b/goreleaser/configure.go
@@ -22,7 +22,7 @@ import (
 
 var (
 	ImagePrefixes = []string{"otel", "ghcr.io/open-telemetry/opentelemetry-collector-releases"}
-	Architectures = []string{"386", "amd64", "arm64"}
+	Architectures = []string{"386", "amd64", "arm64", "ppc64le"}
 
 	distsFlag = flag.String("d", "", "Collector distributions(s) to build, comma-separated")
 )