Skip to content

Commit 7b9bd62

Browse files
sean-breensean-breen
committed
Merge branch 'main' into add-run-directory
2 parents aa01a6a + cd84dbe commit 7b9bd62

File tree

68 files changed

+2693
-428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2693
-428
lines changed

‎.github/workflows/assertion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
osarch: [amd64, arm64]
5555
steps:
5656
- name: Checkout Repository
57-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
57+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5858

5959
- name: Set up Go
6060
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0

‎.github/workflows/ci.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-22.04
2929
if: github.ref == 'refs/heads/main'
3030
steps:
31-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
31+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3232
with:
3333
fetch-tags: 'true'
3434
- name: Configure Go Proxy
@@ -60,7 +60,7 @@ jobs:
6060
name: Lint
6161
runs-on: ubuntu-22.04
6262
steps:
63-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
63+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6464
- name: Configure Go Proxy
6565
uses: ./.github/actions/configure-goproxy
6666
with:
@@ -78,7 +78,7 @@ jobs:
7878
~/go/pkg/mod
7979
key: ${{ runner.os }}-go-
8080
- name: Lint Go
81-
uses: golangci/golangci-lint-action@0a35821d5c230e903fcfe077583637dea1b27b47 # v9.0.0
81+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
8282
with:
8383
version: v2.4.0
8484

@@ -88,7 +88,7 @@ jobs:
8888
permissions:
8989
contents: write
9090
steps:
91-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
91+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9292
- name: Configure Go Proxy
9393
uses: ./.github/actions/configure-goproxy
9494
with:
@@ -117,7 +117,7 @@ jobs:
117117
name: Unit tests with race condition detection
118118
runs-on: ubuntu-22.04
119119
steps:
120-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
120+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
121121
- name: Configure Go Proxy
122122
uses: ./.github/actions/configure-goproxy
123123
with:
@@ -141,7 +141,7 @@ jobs:
141141
name: Build Unsigned Snapshot
142142
runs-on: ubuntu-22.04
143143
steps:
144-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
144+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
145145
with:
146146
fetch-tags: 'true'
147147
- name: Configure Go Proxy
@@ -190,7 +190,7 @@ jobs:
190190
- image: "alpine"
191191
version: "3.22"
192192
steps:
193-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
193+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
194194
- name: Configure Go Proxy
195195
uses: ./.github/actions/configure-goproxy
196196
with:
@@ -246,7 +246,7 @@ jobs:
246246
- image: "alpine"
247247
version: "3.22"
248248
steps:
249-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
249+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
250250
- name: Configure Go Proxy
251251
uses: ./.github/actions/configure-goproxy
252252
with:
@@ -309,7 +309,7 @@ jobs:
309309
version: "mainline"
310310
release: "alpine"
311311
steps:
312-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
312+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
313313
- name: Configure Go Proxy
314314
uses: ./.github/actions/configure-goproxy
315315
with:
@@ -382,7 +382,7 @@ jobs:
382382
release: "debian"
383383
path: "/nginx-plus/agent"
384384
steps:
385-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
385+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
386386
- name: Configure Go Proxy
387387
uses: ./.github/actions/configure-goproxy
388388
with:
@@ -454,7 +454,7 @@ jobs:
454454
version: "mainline"
455455
release: "alpine"
456456
steps:
457-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
457+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
458458
- name: Configure Go Proxy
459459
uses: ./.github/actions/configure-goproxy
460460
with:
@@ -527,7 +527,7 @@ jobs:
527527
release: "debian"
528528
path: "/nginx-plus/agent"
529529
steps:
530-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
530+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
531531
- name: Configure Go Proxy
532532
uses: ./.github/actions/configure-goproxy
533533
with:
@@ -585,7 +585,7 @@ jobs:
585585
permissions:
586586
contents: write
587587
steps:
588-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
588+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
589589
- name: Configure Go Proxy
590590
uses: ./.github/actions/configure-goproxy
591591
with:
@@ -629,7 +629,7 @@ jobs:
629629
runs-on: ubuntu-22.04
630630
needs: build-unsigned-snapshot
631631
steps:
632-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
632+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
633633
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
634634
with:
635635
go-version-file: 'go.mod'

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
docs_only: ${{ github.event.pull_request && steps.docs.outputs.docs_only == 'true' }}
3333
steps:
3434
- name: Checkout Repository
35-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
35+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3636
with:
3737
fetch-depth: 0
3838

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
pull-requests: write # for actions/dependency-review-action to post comments
2323
steps:
2424
- name: "Checkout Repository"
25-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
25+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2626

2727
- name: "Dependency Review"
2828
uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2

‎.github/workflows/release-branch.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
create_pull_request: ${{steps.vars.outputs.create_pull_request }}
7070
steps:
7171
- name: Checkout Repository
72-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
72+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
7373
with:
7474
ref: ${{ inputs.releaseBranch }}
7575

@@ -92,7 +92,7 @@ jobs:
9292
release_id: ${{ steps.vars.outputs.RELEASE_ID }}
9393
steps:
9494
- name: Checkout Repository
95-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
95+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9696
if: ${{ needs.vars.outputs.github_release == 'true' }}
9797
with:
9898
ref: ${{ inputs.releaseBranch }}
@@ -188,7 +188,7 @@ jobs:
188188
contents: write
189189
steps:
190190
- name: Checkout Repository
191-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
191+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
192192
if: ${{ needs.vars.outputs.tag_release == 'true' }}
193193
with:
194194
ref: ${{ inputs.releaseBranch }}
@@ -210,7 +210,7 @@ jobs:
210210
contents: write # Needed to update a release
211211
steps:
212212
- name: Checkout Repository
213-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
213+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
214214
with:
215215
ref: ${{ inputs.releaseBranch }}
216216

@@ -317,7 +317,7 @@ jobs:
317317
pull-requests: write
318318
steps:
319319
- name: Checkout Repository
320-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
320+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
321321
with:
322322
ref: ${{ inputs.releaseBranch }}
323323

‎.github/workflows/scorecards.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828

2929
steps:
3030
- name: "Checkout code"
31-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
31+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3232
with:
3333
persist-credentials: false
3434

@@ -55,6 +55,6 @@ jobs:
5555

5656
# Upload the results to GitHub's code scanning dashboard.
5757
- name: "Upload to code-scanning"
58-
uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
58+
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
5959
with:
6060
sarif_file: results.sarif

‎.github/workflows/upload-release-assets.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
upload_azure: ${{steps.vars.outputs.upload_azure }}
3737
steps:
3838
- name: Checkout Repository
39-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
39+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4040
with:
4141
ref: ${{ inputs.releaseBranch }}
4242

@@ -53,7 +53,7 @@ jobs:
5353
needs: [vars]
5454
steps:
5555
- name: Checkout Repository
56-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
56+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5757
with:
5858
ref: ${{ inputs.releaseBranch }}
5959

‎Makefile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ GOBIN ?= $$(go env GOPATH)/bin
1717
# | OS_RELEASE | OS_VERSION | NOTES |
1818
# | ---------------- | ----------------------------------------- | -------------------------------------------------------------- |
1919
# | amazonlinux | 2, 2023 | |
20-
# | ubuntu | 22.04, 24.04 25.04 | |
20+
# | ubuntu | 22.04, 24.04, 25.04 25.10 | |
2121
# | debian | bullseye-slim, bookworm-slim, trixie-slim | |
22-
# | alpine | 3.19, 3.20, 3.21 3.22 | |
2322
# | redhatenterprise | 8, 9, 10 | |
2423
# | rockylinux | 8, 9, 10 | |
2524
# | almalinux | 8, 9, 10 | |
25+
# | alpine | 3.20, 3.21 3.22 | |
2626
# | oraclelinux | 8, 9, 10 | |
27-
# | suse | sle15 | |
27+
# | suse | sle15, sle16 | |
2828
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
2929
OS_RELEASE ?= ubuntu
3030
OS_VERSION ?= 24.04
@@ -69,8 +69,8 @@ APK_PACKAGE := ./build/$(PACKAGE_NAME).apk
6969
DEB_PACKAGE := ./build/$(PACKAGE_NAME).deb
7070
RPM_PACKAGE := ./build/$(PACKAGE_NAME).rpm
7171

72-
MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
73-
MOCK_MANAGEMENT_PLANE_EXTERNAL_FILE_SERVER ?=
72+
MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
73+
MOCK_MANAGEMENT_PLANE_EXTERNAL_FILE_SERVER ?=
7474
MOCK_MANAGEMENT_PLANE_LOG_LEVEL ?= INFO
7575
MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS ?= 127.0.0.1:0
7676
MOCK_MANAGEMENT_PLANE_API_ADDRESS ?= 127.0.0.1:0
@@ -165,11 +165,11 @@ build-mock-management-otel-collector:
165165
mkdir -p $(BUILD_DIR)/mock-management-otel-collector
166166
@CGO_ENABLED=0 GOARCH=$(OSARCH) GOOS=linux $(GOBUILD) -o $(BUILD_DIR)/mock-management-otel-collector/collector test/mock/collector/mock-collector/main.go
167167

168-
integration-test: $(SELECTED_PACKAGE) build-mock-management-plane-grpc
168+
integration-test: $(SELECTED_PACKAGE) build-mock-management-plane-grpc
169169
TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) BUILD_TARGET="install-agent-local" CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} \
170170
PACKAGES_REPO=$(OSS_PACKAGES_REPO) PACKAGE_NAME=$(PACKAGE_NAME) BASE_IMAGE=$(BASE_IMAGE) DOCKERFILE_PATH=$(DOCKERFILE_PATH) IMAGE_PATH=$(IMAGE_PATH) TAG=${IMAGE_TAG} \
171171
OS_VERSION=$(OS_VERSION) OS_RELEASE=$(OS_RELEASE) \
172-
go test -v ./test/integration/installuninstall ./test/integration/managementplane ./test/integration/auxiliarycommandserver ./test/integration/nginxless
172+
go test -v ./test/integration/installuninstall ./test/integration/managementplane ./test/integration/auxiliarycommandserver ./test/integration/nginxless
173173

174174
upgrade-test: $(SELECTED_PACKAGE) build-mock-management-plane-grpc
175175
TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) BUILD_TARGET="install-agent-repo" CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} \
@@ -181,8 +181,9 @@ official-image-integration-test: $(SELECTED_PACKAGE) build-mock-management-plane
181181
TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} BUILD_TARGET="install" \
182182
PACKAGES_REPO=$(OSS_PACKAGES_REPO) TAG=${TAG} PACKAGE_NAME=$(PACKAGE_NAME) BASE_IMAGE=$(BASE_IMAGE) DOCKERFILE_PATH=$(OFFICIAL_IMAGE_DOCKERFILE_PATH) \
183183
OS_VERSION=$(OS_VERSION) OS_RELEASE=$(OS_RELEASE) IMAGE_PATH=$(IMAGE_PATH) \
184+
NGINX_LICENSE_JWT=$(NGINX_LICENSE_JWT) \
184185
go test -v ./test/integration/managementplane ./test/integration/auxiliarycommandserver
185-
186+
186187
metrics-test: $(SELECTED_PACKAGE) build-mock-management-otel-collector
187188
TEST_ENV="Container" CONTAINER_OS_TYPE=$(CONTAINER_OS_TYPE) CONTAINER_NGINX_IMAGE_REGISTRY=${CONTAINER_NGINX_IMAGE_REGISTRY} BUILD_TARGET="install" \
188189
PACKAGES_REPO=$(OSS_PACKAGES_REPO) TAG=${TAG} PACKAGE_NAME=$(PACKAGE_NAME) BASE_IMAGE=$(BASE_IMAGE) DOCKERFILE_PATH=$(OFFICIAL_IMAGE_DOCKERFILE_PATH) \

‎Makefile.packaging‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ PACKAGE_BUILD ?= 1
1212
PACKAGE_VERSION ?= $(shell echo ${VERSION} | tr -d 'v')
1313
TARBALL_NAME := $(PACKAGE_PREFIX).tar.gz
1414

15-
DEB_DISTROS ?= ubuntu-plucky-25.04 ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-trixie-13 debian-bookworm-12 debian-bullseye-11
15+
DEB_DISTROS ?= ubuntu-questing-25.10 ubuntu-plucky-25.04 ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-trixie-13 debian-bookworm-12 debian-bullseye-11
1616
DEB_ARCHS ?= arm64 amd64
17-
RPM_DISTROS ?= suse-15-x86_64
17+
RPM_DISTROS ?= suse-15-x86_64 suse-16-x86_64
1818
RPM_ARCH := x86_64
1919
REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 redhatenterprise-10
2020
REDHAT_ARCHS ?= aarch64 x86_64
21-
APK_VERSIONS ?= 3.18 3.19 3.20 3.21 3.22
21+
APK_VERSIONS ?= 3.20 3.21 3.22
2222
APK_ARCHS ?= aarch64 x86_64
2323
APK_REVISION ?= 1
2424
AMAZON_VERSIONS ?= amazon-2 amazon-2023

0 commit comments

Comments
 (0)