Skip to content

Commit c07da1c

Browse files
authored
remove s390x, arm/7 and ppc64le (#7784)
1 parent 172f92e commit c07da1c

10 files changed

+15
-20
lines changed

.github/data/matrix-images-oss.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"alpine"
55
],
66
"platforms": [
7-
"linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
7+
"linux/arm64, linux/amd64"
88
],
99
"include": [
1010
{
1111
"image": "ubi",
12-
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
12+
"platforms": "linux/arm64, linux/amd64"
1313
}
1414
]
1515
}

.github/data/matrix-regression.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"image": "debian",
77
"type": "oss",
88
"marker": "'not upgrade'",
9-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
9+
"platforms": "linux/arm64, linux/amd64"
1010
},
1111
{
1212
"label": "regression",

.github/workflows/build-base-images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Setup QEMU
6464
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
6565
with:
66-
platforms: arm,arm64,ppc64le,s390x
66+
platforms: arm64
6767

6868
- name: Authenticate to Google Cloud
6969
id: auth
@@ -128,7 +128,7 @@ jobs:
128128
- name: Setup QEMU
129129
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
130130
with:
131-
platforms: arm64,s390x
131+
platforms: arm64
132132

133133
- name: Authenticate to Google Cloud
134134
id: auth

.github/workflows/build-oss.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
- name: Setup QEMU
116116
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
117117
with:
118-
platforms: arm,arm64,ppc64le,s390x
118+
platforms: arm64
119119
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
120120

121121
- name: Docker Buildx

.github/workflows/build-plus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
- name: Setup QEMU
123123
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
124124
with:
125-
platforms: arm,arm64,ppc64le,s390x
125+
platforms: arm64
126126
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
127127

128128
- name: Docker Buildx

.github/workflows/build-ubi-dependency.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- name: Setup QEMU
9595
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
9696
with:
97-
platforms: arm64,ppc64le,s390x
97+
platforms: arm64
9898

9999
- name: Docker Buildx
100100
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
@@ -126,7 +126,7 @@ jobs:
126126
push: true
127127
# build multi-arch so that it can be mounted from any image
128128
# even though only ppc64le will contain binaries
129-
platforms: "linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
129+
platforms: "linux/amd64,linux/arm64"
130130
tags: ${{ steps.meta.outputs.tags }}
131131
labels: ${{ steps.meta.outputs.labels }}
132132
annotations: ${{ steps.meta.outputs.annotations }}

.github/workflows/patch-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Setup QEMU
5353
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
5454
with:
55-
platforms: arm,arm64,ppc64le,s390x
55+
platforms: arm64
5656

5757
- name: Authenticate to Google Cloud
5858
id: auth

.goreleaser.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ builds:
99
- linux
1010
goarch:
1111
- amd64
12-
- arm
1312
- arm64
14-
- ppc64le
15-
- s390x
16-
goarm:
17-
- 7
1813
flags:
1914
- -trimpath
2015
gcflags:

site/content/installation/build-nginx-ingress-controller.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ The _Makefile_ includes several key variables. You have the option to either mod
182182
{{<bootstrap-table "table table-striped table-bordered">}}
183183
| <div style="width:200px">Variable</div> | Description |
184184
|-----------------------------------------|---------------|
185-
| _ARCH_ | Defines the architecture for the image and binary. The default is `amd64`, but you can also choose from `arm64`, `arm`, `ppc64le`, and `s390x`. |
185+
| _ARCH_ | Defines the architecture for the image and binary. The default is `amd64`, but you can also use `arm64`. |
186186
| _PREFIX_ | Gives the image its name. The default is `nginx/nginx-ingress`. |
187187
| _TAG_ | Adds a tag to the image. This is often the version of NGINX Ingress Controller. |
188188
| _DOCKER\_BUILD\_OPTIONS_ | Allows for additional [options](https://docs.docker.com/engine/reference/commandline/build/#options) during the `docker build` process, like `--pull`. |

site/content/technical-specifications.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ _All images include NGINX 1.27.4._
4646

4747
{{< bootstrap-table "table table-bordered table-responsive" >}}
4848
|<div style="width:200px">Name</div> | <div style="width:100px">Base image</div> | DockerHub image | Architectures |
49-
| ---| --- | --- | --- | --- |
50-
|Alpine-based image | ``nginx:1.27.4-alpine``,<br>based on on ``alpine:3.21`` | ``nginx/nginx-ingress:{{< nic-version >}}-alpine`` | arm/v7<br>arm64<br>amd64<br>ppc64le<br>s390x |
51-
|Debian-based image | ``nginx:1.27.4``,<br>based on on ``debian:12-slim`` | ``nginx/nginx-ingress:{{< nic-version >}}`` | arm/v7<br>arm64<br>amd64<br>ppc64le<br>s390x |
52-
|Ubi-based image | ``redhat/ubi9-minimal`` | ``nginx/nginx-ingress:{{< nic-version >}}-ubi`` | arm64<br>amd64<br>ppc64le<br>s390x |
49+
| ---| --- | --- | --- |
50+
|Alpine-based image | ``nginx:1.27.4-alpine``,<br>based on on ``alpine:3.21`` | ``nginx/nginx-ingress:{{< nic-version >}}-alpine`` | arm64<br>amd64 |
51+
|Debian-based image | ``nginx:1.27.4``,<br>based on on ``debian:12-slim`` | ``nginx/nginx-ingress:{{< nic-version >}}`` | arm64<br>amd64 |
52+
|Ubi-based image | ``redhat/ubi9-minimal`` | ``nginx/nginx-ingress:{{< nic-version >}}-ubi`` | arm64<br>amd64 |
5353
{{% /bootstrap-table %}}
5454

5555
---

0 commit comments

Comments
 (0)