Skip to content

Commit

Permalink
Removed ppc64le and s390x arch support
Browse files Browse the repository at this point in the history 
A crucial dependency does not support them any more
  • Loading branch information
@rajch
rajch committed May 5, 2024
1 parent 3fd1ae5 commit a3d5e07
Show file tree
Hide file tree
Showing 8 changed files with 104 additions and 94 deletions.
1 change: 1 addition & 0 deletions reweave/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ All changes made to the weave net codebase during the reweave effort will be doc
* Upgraded golang.org/x/sys to v0.18.0
* Upgraded golang.org/x/crypto to v0.21.0
* Ran `go mod tidy` and `go mod vendor`
* Removed support for ppc64le and s90x architectures, because libpcap-0.8 in the debian buster repository does not provide binaries for those architectures any more

## 2.8.6

Expand Down
2 changes: 2 additions & 0 deletions reweave/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@ build: build-images build-plugin
.PHONY: publish-images
publish-images: submodule
REGISTRY_USER=${REGISTRY_USER} IMAGE_VERSION=${IMAGE_VERSION} \
PLATFORMS="linux/amd64,linux/arm,linux/arm64" \
ALPINE_BASEIMAGE=$(ALPINE_BASEIMAGE) \
PUBLISH=true \
tools/build-images.sh

.PHONY: publish-plugin
publish-plugin:
REGISTRY_USER=${REGISTRY_USER} IMAGE_VERSION=${IMAGE_VERSION} \
PLATFORMS="amd64,arm,arm64" \
PUBLISH=true \
tools/build-plugin.sh

Expand Down
13 changes: 10 additions & 3 deletions reweave/build/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,19 @@ ENV GOARM 7

# The names of the architectures that we fetch cross-compilers for
# from the Debian packages.
# Disabling support for ppc64el and s390x architectures, as the
# debian buster repository does not host binaries for libpcap-0.8
# on those architectures any more.
# ENV DEB_CROSSPLATFORMS \
# amd64 \
# armhf \
# arm64 \
# ppc64el \
# s390x
ENV DEB_CROSSPLATFORMS \
amd64 \
armhf \
arm64 \
ppc64el \
s390x
arm64

# Install the build-essential and crossbuild-essential-ARCH packages
RUN <<EOCROSSCOMPILERS
Expand Down
18 changes: 11 additions & 7 deletions reweave/build/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ BUILDARCH?=amd64
# naming platforms.
# All supported architectures must have an "ifeq" block below that
# selects the corrsponding Debian platform architecture in CCARCH
ALL_ARCHITECTURES=amd64 arm arm64 ppc64le s390x
# Disabling support for ppc64le and s390x architectures, as the
# debian buster repository does not host binaries for libpcap-0.8
# on those architectures any more.
# ALL_ARCHITECTURES=amd64 arm arm64 ppc64le s390x
ALL_ARCHITECTURES=amd64 arm arm64

# We need the Debian platform architecture format, for
# crosscompilation
Expand All @@ -24,12 +28,12 @@ endif
ifeq ($(ARCH),arm64)
CCARCH=aarch64-linux-gnu
endif
ifeq ($(ARCH),ppc64le)
CCARCH=powerpc64le-linux-gnu
endif
ifeq ($(ARCH),s390x)
CCARCH=s390x-linux-gnu
endif
# ifeq ($(ARCH),ppc64le)
# CCARCH=powerpc64le-linux-gnu
# endif
# ifeq ($(ARCH),s390x)
# CCARCH=s390x-linux-gnu
# endif

# Set the architecture-specific C compiler and library
# load path.
Expand Down
2 changes: 1 addition & 1 deletion reweave/scans/badge.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"schemaVersion": 1, "label": "Vulnerabilty count", "message": "19", "color": "orange"}
{"schemaVersion": 1, "label": "Vulnerabilty count", "message": "18", "color": "orange"}
156 changes: 76 additions & 80 deletions reweave/scans/report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

```
Report date: 2024-05-04
Unique vulnerability count: 19
Images version: 2.8.6
Unique vulnerability count: 18
Images version: 2.8.7-beta1
```

## Scanner Details
Expand All @@ -23,97 +23,93 @@ Supported DB Schema: 5

## Vulnerabilities

### weave-kube: (19)
### weave-kube: (18)

```
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
curl 8.5.0-r0 apk CVE-2024-0853 Medium
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
golang.org/x/net v0.17.0 0.23.0 go-module GHSA-4v7x-pqxf-cx7m Medium
libuv 1.47.0-r0 apk CVE-2024-24806 High
nghttp2-libs 1.58.0-r0 apk CVE-2024-28182 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
curl 8.5.0-r0 apk CVE-2024-0853 Medium
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
libuv 1.47.0-r0 apk CVE-2024-24806 High
nghttp2-libs 1.58.0-r0 apk CVE-2024-28182 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
```

### weave-npc: (13)
### weave-npc: (12)

```
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
golang.org/x/net v0.17.0 0.23.0 go-module GHSA-4v7x-pqxf-cx7m Medium
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
```

### weave: (19)
### weave: (18)

```
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
curl 8.5.0-r0 apk CVE-2024-0853 Medium
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
golang.org/x/net v0.17.0 0.23.0 go-module GHSA-4v7x-pqxf-cx7m Medium
libuv 1.47.0-r0 apk CVE-2024-24806 High
nghttp2-libs 1.58.0-r0 apk CVE-2024-28182 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
curl 8.5.0-r0 apk CVE-2024-0853 Medium
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
libuv 1.47.0-r0 apk CVE-2024-24806 High
nghttp2-libs 1.58.0-r0 apk CVE-2024-28182 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
```

### weaveexec: (19)
### weaveexec: (18)

```
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
curl 8.5.0-r0 apk CVE-2024-0853 Medium
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
golang.org/x/net v0.17.0 0.23.0 go-module GHSA-4v7x-pqxf-cx7m Medium
libuv 1.47.0-r0 apk CVE-2024-24806 High
nghttp2-libs 1.58.0-r0 apk CVE-2024-28182 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY
busybox 1.36.1-r15 apk CVE-2023-42366 Medium
busybox 1.36.1-r15 apk CVE-2023-42365 Medium
busybox 1.36.1-r15 apk CVE-2023-42364 Medium
busybox 1.36.1-r15 apk CVE-2023-42363 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42366 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42365 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42364 Medium
busybox-binsh 1.36.1-r15 apk CVE-2023-42363 Medium
curl 8.5.0-r0 apk CVE-2024-0853 Medium
curl 8.5.0-r0 apk CVE-2024-2466 Unknown
curl 8.5.0-r0 apk CVE-2024-2398 Unknown
curl 8.5.0-r0 apk CVE-2024-2004 Unknown
libuv 1.47.0-r0 apk CVE-2024-24806 High
nghttp2-libs 1.58.0-r0 apk CVE-2024-28182 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42366 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42365 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium
ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium
```

2 changes: 1 addition & 1 deletion website/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ See [Installing Weave Net]({{ '/install/installing-weave' | relative_url }}), an

See [Integrating Docker via the Network Plugin (V2)]({{ '/install/plugin/plugin-v2' | relative_url }}).

**Note:** From version 2.8.6 onwards, the Docker V2 plugin is available for amd64, arm, arm64, ppc64le and s390x architectures. Prior to this, it was only available for amd64.
**Note:** From version 2.8.6 onwards, the Docker V2 plugin is available for amd64, arm, arm64 ~~, ppc64le and s390x~~ architectures. Prior to this, it was only available for amd64.

## All other uses, and more

Expand Down
4 changes: 2 additions & 2 deletions website/install/plugin/plugin-v2.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ architectures:
* amd64
* arm
* arm64
* ppc64le
* s390x
* ~~ppc64le~~
* ~~s390x~~

You can use the following commands to install the plugin appropriate to your architecture:

Expand Down

0 comments on commit a3d5e07

Please sign in to comment.