From e42bc298a47b469ea6acb8e4d2c23104aaf81a3e Mon Sep 17 00:00:00 2001 From: Raj Chaudhuri Date: Wed, 10 Apr 2024 14:23:57 +0530 Subject: [PATCH] Add release v2.8.6 --- CHANGELOG.md | 9 +++++++++ README.md | 4 ++-- reweave/CHANGELOG.md | 10 ++++++++++ reweave/Makefile | 3 ++- reweave/scans/badge.json | 2 +- reweave/scans/report.md | 15 +++++++++------ website/index.md | 14 ++++++++++++-- 7 files changed, 45 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03b00db0..a015bd73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## Release 2.8.6 + +From this release onwards, the Docker V2 Plugin will be published for all supported architectures. It will be named using the pattern `rajchaudhuri/net-plugin:-`. The latest version will also be published as `rajchaudhuri/net-plugin:latest_release-`. Supported architectures are `amd64`,`arm`,`arm64`,`ppc64le` and `s390x`. It can be installed on a Swarm-mode-enabled Docker host as follows: + +```bash +ARCH=$(docker version -f '{{.Server.Arch}}') +docker plugin install rajchaudhuri/net-plugin:latest_release-$ARCH +``` + ## Release 2.8.5 This release has upgraded dependencies based on CVE recommendations. diff --git a/README.md b/README.md index 2fbd70fd..239eccc5 100644 --- a/README.md +++ b/README.md @@ -14,10 +14,10 @@ The history of the ReWeave effort can be found in [HISTORY.md](HISTORY.md). On a newly created Kubernetes cluster, the Weave Net CNI pluging can be installed by running the following command: ``` -kubectl apply -f https://reweave.azurewebsites.net/k8s/v1.28/net.yaml +kubectl apply -f https://reweave.azurewebsites.net/k8s/v1.29/net.yaml ``` -Replace `v1.28` with the version on Kubernetes on your cluster. +Replace `v1.29` with the version on Kubernetes on your cluster. That endpoint is provided by the companion project [weave-endpoint](https://github.com/rajch/weave-endpoint). diff --git a/reweave/CHANGELOG.md b/reweave/CHANGELOG.md index 78ac17da..11d3453f 100644 --- a/reweave/CHANGELOG.md +++ b/reweave/CHANGELOG.md @@ -2,6 +2,15 @@ All changes made to the weave net codebase during the reweave effort will be documented in this file. +## 2.8.6 + +### Changed + +* Changed version in `reweave/Makefile` to 2.8.6 +* Modified reweave and main CHANGELOG.md +* Modified `reweave/Makefile` to ensure that `make build-plugin` builds the plugin only for the host architecture +* Made some documentation changes + ## 2.8.6-beta1 ### Changed @@ -248,6 +257,7 @@ A new build process was created here. * Multi-stage Dockerfile, and a Makefile for the second stage, in `reweave/build` ### Changed + * Included image building targets in Makefile directly under `reweave` * Changed `IMAGE_VERSION` to `2.8.2-beta0` in Makefile directly under `reweave` * The Alpine base image for all weave net images was set to `alpine:3.17.2` via the multi-stage Dockerfile diff --git a/reweave/Makefile b/reweave/Makefile index 20c1453f..8105b49f 100644 --- a/reweave/Makefile +++ b/reweave/Makefile @@ -1,4 +1,4 @@ -IMAGE_VERSION ?= 2.8.6-beta1 +IMAGE_VERSION ?= 2.8.6 REGISTRY_USER ?= rajchaudhuri ALPINE_BASEIMAGE ?= alpine:3.19.1 @@ -15,6 +15,7 @@ build-images: submodule .PHONY: build-plugin build-plugin: ../prog/net-plugin/launch.sh ../prog/net-plugin/config.json REGISTRY_USER=${REGISTRY_USER} IMAGE_VERSION=${IMAGE_VERSION} \ + PLATFORMS="$$(docker version -f '{{ .Server.Arch }}')" \ tools/build-plugin.sh .PHONY: build diff --git a/reweave/scans/badge.json b/reweave/scans/badge.json index da30a955..79efff6d 100644 --- a/reweave/scans/badge.json +++ b/reweave/scans/badge.json @@ -1 +1 @@ -{"schemaVersion": 1, "label": "Vulnerabilty count", "message": "17", "color": "orange"} +{"schemaVersion": 1, "label": "Vulnerabilty count", "message": "18", "color": "orange"} diff --git a/reweave/scans/report.md b/reweave/scans/report.md index 6fe55307..f4ac53fb 100644 --- a/reweave/scans/report.md +++ b/reweave/scans/report.md @@ -1,9 +1,9 @@ # Vulnerability Report ``` -Report date: 2024-04-06 -Unique vulnerability count: 17 -Images version: 2.8.5 +Report date: 2024-04-10 +Unique vulnerability count: 18 +Images version: 2.8.6 ``` ## Scanner Details @@ -23,7 +23,7 @@ Supported DB Schema: 5 ## Vulnerabilities -### weave-kube: (17) +### weave-kube: (18) ``` NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY @@ -40,6 +40,7 @@ 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 @@ -64,7 +65,7 @@ ssl_client 1.36.1-r15 apk CVE-2023-42364 Medium ssl_client 1.36.1-r15 apk CVE-2023-42363 Medium ``` -### weave: (17) +### weave: (18) ``` NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY @@ -81,13 +82,14 @@ 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: (17) +### weaveexec: (18) ``` NAME INSTALLED FIXED-IN TYPE VULNERABILITY SEVERITY @@ -104,6 +106,7 @@ 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 diff --git a/website/index.md b/website/index.md index b462b46b..579ef489 100644 --- a/website/index.md +++ b/website/index.md @@ -14,9 +14,9 @@ If you are here for the most popular use of Weave Net - the famous one-line inst You can install Weave Net on a Kubernetes cluster using: ```bash -kubectl apply -f https://reweave.azurewebsites.net/k8s/v1.25/net.yaml +kubectl apply -f https://reweave.azurewebsites.net/k8s/v1.29/net.yaml ``` -where the `v1.25` part can be replaced with any kubernetes version, the minimum being `v1.8`. +where the `v1.29` part can be replaced with any Kubernetes version, the minimum being `v1.8`. If you prefer the older method using `kubectl version`, that works too: @@ -33,6 +33,16 @@ kubectl apply -f https://github.com/rajch/weave/releases/latest/download/weave-d More details, and options can be found on the [Integrating Kubernetes via the Addon]({{ '/kubernetes/kube-addon' | relative_url }}) page. +## Using Weave as a (legacy) Docker Plugin + +See [Installing Weave Net]({{ '/install/installing-weave' | relative_url }}), and then [Launching Weave Net]({{ '/install/using-weave' | relative_url }}). + +## Using Weave as a Docker Managed (V2) Plugin in Swarm Mode + +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. + ## All other uses, and more For all other uses, proceed to the [Weave Net overview]({{ '/overview' | relative_url }}).