From c4292f71065daa92f1d2c35ec8357aa20fa9cdd3 Mon Sep 17 00:00:00 2001 From: Donal Hurley Date: Wed, 23 Jul 2025 14:29:43 +0100 Subject: [PATCH 1/3] Add OS support for ubuntu 25.04 and RHEL 10 --- .github/workflows/ci.yml | 18 +++++++++--------- Makefile | 12 ++++++------ Makefile.packaging | 12 ++++++------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c78516c8..5e8c3a822 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -119,32 +119,32 @@ jobs: fail-fast: false matrix: container: - - image: "rockylinux" - version: "8" - image: "rockylinux" version: "9" - - image: "almalinux" - version: "8" + - image: "rockylinux" + version: "10" - image: "almalinux" version: "9" + - image: "almalinux" + version: "10" - image: "amazonlinux" version: "2" - image: "amazonlinux" version: "2023" - - image: "oraclelinux" - version: "8" - image: "oraclelinux" version: "9" + - image: "oraclelinux" + version: "10" - image: "ubuntu" - version: "24.04" + version: "25.04" + - image: "alpine" + version: "3.19" - image: "alpine" version: "3.20" - image: "alpine" version: "3.21" - image: "alpine" version: "3.22" - - image: "alpine" - version: "3.21" - image: "debian" version: "bullseye-slim" - image: "debian" diff --git a/Makefile b/Makefile index e541ac1b4..9a468cd2d 100644 --- a/Makefile +++ b/Makefile @@ -31,13 +31,13 @@ GOTIDY = ${GOMOD} tidy # | OS_RELEASE | OS_VERSION | NOTES | # | ---------------- | ----------------------------------------- | -------------------------------------------------------------- | # | amazonlinux | 2, 2023 | | -# | ubuntu | 20.04, 22.04, 24.04 | | +# | ubuntu | 22.04, 24.04 25.04 | | # | debian | bullseye-slim, bookworm-slim | | -# | redhatenterprise | 8, 9 | | -# | rockylinux | 8, 9 | | -# | almalinux | 8, 9 | | -# | alpine | 3.18, 3.19, 3.20, 3.21 3.22 | | -# | oraclelinux | 8, 9 | | +# | redhatenterprise | 8, 9, 10 | | +# | rockylinux | 8, 9, 10 | | +# | almalinux | 8, 9, 10 | | +# | alpine | 3.19, 3.20, 3.21 3.22 | | +# | oraclelinux | 8, 9, 10 | | # | suse | sle15 | | # | freebsd | | Not supported | # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # diff --git a/Makefile.packaging b/Makefile.packaging index 952fd5046..5bf4b9883 100644 --- a/Makefile.packaging +++ b/Makefile.packaging @@ -8,18 +8,18 @@ GITHUB_PACKAGES_DIR := ./build/github/packages AZURE_PACKAGES_DIR := ./build/azure/packages GPG_PUBLIC_KEY := .key -DEB_DISTROS?=ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11 +DEB_DISTROS?=ubuntu-plucky-25.04 ubuntu-noble-24.04 ubuntu-jammy-22.04 debian-bookworm-12 debian-bullseye-11 DEB_ARCHS?=arm64 amd64 -RPM_DISTROS?=oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-15-x86_64 +RPM_DISTROS?=oraclelinux-8-x86_64 oraclelinux-9-x86_64 oraclelinux-10-x86_64 suse-15-x86_64 RPM_ARCH=x86_64 -REDHAT_VERSIONS?=redhatenterprise-8 redhatenterprise-9 +REDHAT_VERSIONS?=redhatenterprise-8 redhatenterprise-9 redhatenterprise-10 REDHAT_ARCHS?=aarch64 x86_64 -ROCKY_VERSIONS?=rocky-8 rocky-9 +ROCKY_VERSIONS?=rocky-8 rocky-9 rocky-10 ROCKY_ARCHS?=aarch64 x86_64 FREEBSD_DISTROS?="FreeBSD:13:amd64" "FreeBSD:14:amd64" -APK_VERSIONS?=3.18 3.19 3.20 3.21 3.22 +APK_VERSIONS?=3.19 3.20 3.21 3.22 APK_ARCHS?=aarch64 x86_64 -ALMA_VERSIONS?=almalinux-8 almalinux-9 +ALMA_VERSIONS?=almalinux-8 almalinux-9 almalinux-10 ALMA_ARCHS?=aarch64 x86_64 AMAZON_VERSIONS?=amazon-2 amazon-2023 AMAZON_ARCHS?=aarch64 x86_64 From f45c6bec76491422648a0b6c1e2deb98afae99f3 Mon Sep 17 00:00:00 2001 From: Donal Hurley Date: Wed, 23 Jul 2025 16:12:00 +0100 Subject: [PATCH 2/3] Bump go version to 1.23.11 --- docs/proto/proto.md | 62 ++++++++++++++++++++--------------------- go.mod | 2 +- sdk/go.mod | 2 +- test/integration/go.mod | 2 +- test/performance/go.mod | 2 +- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/proto/proto.md b/docs/proto/proto.md index 4f40b2f2c..d1d040047 100644 --- a/docs/proto/proto.md +++ b/docs/proto/proto.md @@ -18,6 +18,9 @@ - [AgentConnectStatus.StatusCode](#f5-nginx-agent-sdk-AgentConnectStatus-StatusCode) - [AgentLogging.Level](#f5-nginx-agent-sdk-AgentLogging-Level) +- [command_svc.proto](#command_svc-proto) + - [Commander](#f5-nginx-agent-sdk-Commander) + - [command.proto](#command-proto) - [AgentActivityStatus](#f5-nginx-agent-sdk-AgentActivityStatus) - [ChunkedResourceChunk](#f5-nginx-agent-sdk-ChunkedResourceChunk) @@ -39,9 +42,6 @@ - [NginxConfigStatus.Status](#f5-nginx-agent-sdk-NginxConfigStatus-Status) - [UploadStatus.TransferStatus](#f5-nginx-agent-sdk-UploadStatus-TransferStatus) -- [command_svc.proto](#command_svc-proto) - - [Commander](#f5-nginx-agent-sdk-Commander) - - [common.proto](#common-proto) - [CertificateDates](#f5-nginx-agent-sdk-CertificateDates) - [CertificateName](#f5-nginx-agent-sdk-CertificateName) @@ -341,6 +341,34 @@ Log level enum + +

Top

+ +## command_svc.proto + + + + + + + + + + + +### Commander +Represents a service used to sent command messages between the management server and the agent. + +| Method Name | Request Type | Response Type | Description | +| ----------- | ------------ | ------------- | ------------| +| CommandChannel | [Command](#f5-nginx-agent-sdk-Command) stream | [Command](#f5-nginx-agent-sdk-Command) stream | A Bidirectional streaming RPC established by the agent and is kept open | +| Download | [DownloadRequest](#f5-nginx-agent-sdk-DownloadRequest) | [DataChunk](#f5-nginx-agent-sdk-DataChunk) stream | A streaming RPC established by the agent and is used to download resources associated with commands The download stream will be kept open for the duration of the data transfer and will be closed when its done. The transfer is a stream of chunks as follows: header -> data chunk 1 -> data chunk N. Each data chunk is of a size smaller than the maximum gRPC payload | +| Upload | [DataChunk](#f5-nginx-agent-sdk-DataChunk) stream | [UploadStatus](#f5-nginx-agent-sdk-UploadStatus) | A streaming RPC established by the agent and is used to upload resources associated with commands | + + + + +

Top

@@ -652,34 +680,6 @@ Transfer status enum - -

Top

- -## command_svc.proto - - - - - - - - - - - -### Commander -Represents a service used to sent command messages between the management server and the agent. - -| Method Name | Request Type | Response Type | Description | -| ----------- | ------------ | ------------- | ------------| -| CommandChannel | [Command](#f5-nginx-agent-sdk-Command) stream | [Command](#f5-nginx-agent-sdk-Command) stream | A Bidirectional streaming RPC established by the agent and is kept open | -| Download | [DownloadRequest](#f5-nginx-agent-sdk-DownloadRequest) | [DataChunk](#f5-nginx-agent-sdk-DataChunk) stream | A streaming RPC established by the agent and is used to download resources associated with commands The download stream will be kept open for the duration of the data transfer and will be closed when its done. The transfer is a stream of chunks as follows: header -> data chunk 1 -> data chunk N. Each data chunk is of a size smaller than the maximum gRPC payload | -| Upload | [DataChunk](#f5-nginx-agent-sdk-DataChunk) stream | [UploadStatus](#f5-nginx-agent-sdk-UploadStatus) | A streaming RPC established by the agent and is used to upload resources associated with commands | - - - - -

Top

diff --git a/go.mod b/go.mod index 3a1eaf493..cff21f894 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/nginx/agent/v2 go 1.23.0 -toolchain go1.23.10 +toolchain go1.23.11 require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect diff --git a/sdk/go.mod b/sdk/go.mod index a0468a0bf..219efefbd 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -2,7 +2,7 @@ module github.com/nginx/agent/sdk/v2 go 1.23.0 -toolchain go1.23.10 +toolchain go1.23.11 require ( github.com/cenkalti/backoff/v4 v4.2.1 diff --git a/test/integration/go.mod b/test/integration/go.mod index 406c39f28..dcd9207c4 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -2,7 +2,7 @@ module github.com/nginx/agent/test/integration go 1.23.0 -toolchain go1.23.10 +toolchain go1.23.11 require ( github.com/docker/docker v28.0.1+incompatible diff --git a/test/performance/go.mod b/test/performance/go.mod index 1d0e6ff06..39358d1de 100644 --- a/test/performance/go.mod +++ b/test/performance/go.mod @@ -2,7 +2,7 @@ module github.com/nginx/agent/test/performance go 1.23.0 -toolchain go1.23.10 +toolchain go1.23.11 require ( github.com/gogo/protobuf v1.3.2 From 96a2d13d5e0bfec73060ddb7b67deade28766d73 Mon Sep 17 00:00:00 2001 From: Donal Hurley Date: Wed, 23 Jul 2025 16:25:46 +0100 Subject: [PATCH 3/3] Fix integration tests --- .github/workflows/ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e8c3a822..dd2a18403 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,23 +120,23 @@ jobs: matrix: container: - image: "rockylinux" - version: "9" + version: "8" - image: "rockylinux" - version: "10" - - image: "almalinux" version: "9" - image: "almalinux" - version: "10" + version: "8" + - image: "almalinux" + version: "9" - image: "amazonlinux" version: "2" - image: "amazonlinux" version: "2023" - image: "oraclelinux" - version: "9" + version: "8" - image: "oraclelinux" - version: "10" + version: "9" - image: "ubuntu" - version: "25.04" + version: "24.04" - image: "alpine" version: "3.19" - image: "alpine"