From 497c3af56eaaed774d120191d759cab1030c1f8e Mon Sep 17 00:00:00 2001 From: Rui Fu Date: Fri, 15 May 2026 20:01:36 +0800 Subject: [PATCH 1/2] ci: update Python version to 3.12 in integration test configs --- .ci/tests/integration-oauth2/e2e.yaml | 2 +- .ci/tests/integration-oauth2/e2e_with_downloader.yaml | 2 +- .ci/tests/integration/e2e.yaml | 2 +- .ci/tests/integration/e2e_with_tls.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/tests/integration-oauth2/e2e.yaml b/.ci/tests/integration-oauth2/e2e.yaml index 6eec760dd..f39f6b9d5 100644 --- a/.ci/tests/integration-oauth2/e2e.yaml +++ b/.ci/tests/integration-oauth2/e2e.yaml @@ -6,7 +6,7 @@ setup: - name: build images command: | chmod +x images/build.sh images/samples/build.sh - PULSAR_IMAGE_TAG=3.2.2.1 PULSAR_IMAGE=streamnative/sn-platform PYTHON_VERSION=3.10 KIND_PUSH=true images/build.sh + PULSAR_IMAGE_TAG=3.2.2.1 PULSAR_IMAGE=streamnative/sn-platform PYTHON_VERSION=3.12 KIND_PUSH=true images/build.sh PULSAR_IMAGE_TAG=3.2.2.1 KIND_PUSH=true images/samples/build.sh - name: install helm diff --git a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml index bb2b52f46..d7be3fefb 100644 --- a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml +++ b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml @@ -6,7 +6,7 @@ setup: - name: build images command: | chmod +x images/build.sh images/samples/build.sh - PULSAR_IMAGE_TAG=3.2.2.1 PULSAR_IMAGE=streamnative/sn-platform PYTHON_VERSION=3.9 KIND_PUSH=true images/build.sh + PULSAR_IMAGE_TAG=3.2.2.1 PULSAR_IMAGE=streamnative/sn-platform PYTHON_VERSION=3.12 KIND_PUSH=true images/build.sh PULSAR_IMAGE_TAG=3.2.2.1 KIND_PUSH=true images/samples/build.sh - name: install helm diff --git a/.ci/tests/integration/e2e.yaml b/.ci/tests/integration/e2e.yaml index fa87a1e30..8080d910b 100644 --- a/.ci/tests/integration/e2e.yaml +++ b/.ci/tests/integration/e2e.yaml @@ -6,7 +6,7 @@ setup: - name: build images command: | chmod +x images/build.sh images/samples/build.sh - PULSAR_IMAGE_TAG=3.2.2.1 PULSAR_IMAGE=streamnative/sn-platform KIND_PUSH=true images/build.sh + PULSAR_IMAGE_TAG=3.2.2.1 PULSAR_IMAGE=streamnative/sn-platform PYTHON_VERSION=3.12 KIND_PUSH=true images/build.sh PULSAR_IMAGE_TAG=3.2.2.1 KIND_PUSH=true images/samples/build.sh - name: install helm diff --git a/.ci/tests/integration/e2e_with_tls.yaml b/.ci/tests/integration/e2e_with_tls.yaml index ce56db0b0..396e452f0 100644 --- a/.ci/tests/integration/e2e_with_tls.yaml +++ b/.ci/tests/integration/e2e_with_tls.yaml @@ -6,7 +6,7 @@ setup: - name: build images command: | chmod +x images/build.sh images/samples/build.sh - PULSAR_IMAGE_TAG=3.2.2.1 PULSAR_IMAGE=streamnative/sn-platform PYTHON_VERSION=3.11 KIND_PUSH=true images/build.sh + PULSAR_IMAGE_TAG=3.2.2.1 PULSAR_IMAGE=streamnative/sn-platform PYTHON_VERSION=3.12 KIND_PUSH=true images/build.sh PULSAR_IMAGE_TAG=3.2.2.1 KIND_PUSH=true images/samples/build.sh - name: install helm From 9f59dfbb93283332374120748056a36bc9227227 Mon Sep 17 00:00:00 2001 From: Rui Fu Date: Sat, 16 May 2026 10:31:02 +0800 Subject: [PATCH 2/2] fix: address Trivy CVEs --- .github/workflows/bundle-release.yml | 8 ++++---- .github/workflows/olm-verify.yml | 4 ++-- .github/workflows/project.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/test-helm-charts.yml | 4 ++-- .github/workflows/trivy.yml | 4 ++-- .github/workflows/trivy_scheduled_master.yml | 4 ++-- Dockerfile | 2 +- go.mod | 2 +- go.sum | 4 ++-- images/samples/go-function-samples/Dockerfile | 2 +- images/samples/go-function-samples/func/go.mod | 2 +- operator.Dockerfile | 2 +- redhat.Dockerfile | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/bundle-release.yml b/.github/workflows/bundle-release.yml index 68543d91b..077639d93 100644 --- a/.github/workflows/bundle-release.yml +++ b/.github/workflows/bundle-release.yml @@ -49,10 +49,10 @@ jobs: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set up GO 1.25.9 + - name: Set up GO 1.25.10 uses: actions/setup-go@v5 with: - go-version: 1.25.9 + go-version: 1.25.10 id: go - name: InstallKubebuilder @@ -180,10 +180,10 @@ jobs: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Set up GO 1.25.9 + - name: Set up GO 1.25.10 uses: actions/setup-go@v5 with: - go-version: 1.25.9 + go-version: 1.25.10 id: go - name: InstallKubebuilder diff --git a/.github/workflows/olm-verify.yml b/.github/workflows/olm-verify.yml index 50c734bbd..d1ed679d3 100644 --- a/.github/workflows/olm-verify.yml +++ b/.github/workflows/olm-verify.yml @@ -34,10 +34,10 @@ jobs: - name: checkout uses: actions/checkout@v2 - - name: Set up GO 1.25.9 + - name: Set up GO 1.25.10 uses: actions/setup-go@v5 with: - go-version: 1.25.9 + go-version: 1.25.10 id: go - name: InstallKubebuilder diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml index 5eff1082d..9ccf0db0a 100644 --- a/.github/workflows/project.yml +++ b/.github/workflows/project.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - go-version: [1.25.9] + go-version: [1.25.10] steps: - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@v1.3.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 513b52de4..2e5259164 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,10 +40,10 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Set up GO 1.25.9 + - name: Set up GO 1.25.10 uses: actions/setup-go@v5 with: - go-version: 1.25.9 + go-version: 1.25.10 id: go - name: InstallKubebuilder diff --git a/.github/workflows/test-helm-charts.yml b/.github/workflows/test-helm-charts.yml index 66a0a992b..8b6a0b43e 100644 --- a/.github/workflows/test-helm-charts.yml +++ b/.github/workflows/test-helm-charts.yml @@ -83,11 +83,11 @@ jobs: run: hack/kind-cluster-build.sh --name chart-testing -c 1 -v 10 --k8sVersion v1.23.17 if: steps.list-changed.outputs.changed == 'true' - - name: Set up GO 1.25.9 + - name: Set up GO 1.25.10 if: steps.list-changed.outputs.changed == 'true' uses: actions/setup-go@v5 with: - go-version: 1.25.9 + go-version: 1.25.10 id: go - name: setup kubebuilder 3.6.0 diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml index 74faf5df4..c2fb335d9 100644 --- a/.github/workflows/trivy.yml +++ b/.github/workflows/trivy.yml @@ -57,10 +57,10 @@ jobs: repository: ${{github.event.pull_request.head.repo.full_name}} ref: ${{ github.event.pull_request.head.sha }} - - name: Set up GO 1.25.9 + - name: Set up GO 1.25.10 uses: actions/setup-go@v5 with: - go-version: 1.25.9 + go-version: 1.25.10 id: go - name: InstallKubebuilder diff --git a/.github/workflows/trivy_scheduled_master.yml b/.github/workflows/trivy_scheduled_master.yml index f3a453327..9c0ee4be2 100644 --- a/.github/workflows/trivy_scheduled_master.yml +++ b/.github/workflows/trivy_scheduled_master.yml @@ -67,10 +67,10 @@ jobs: repository: ${{github.event.pull_request.head.repo.full_name}} ref: ${{ github.event.pull_request.head.sha }} - - name: Set up GO 1.25.9 + - name: Set up GO 1.25.10 uses: actions/setup-go@v5 with: - go-version: 1.25.9 + go-version: 1.25.10 id: go - name: InstallKubebuilder diff --git a/Dockerfile b/Dockerfile index 69c0f2c4a..2440b3f0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.25.9-trixie AS builder +FROM --platform=$BUILDPLATFORM golang:1.25.10-trixie AS builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index bf94f8ed4..eae358dff 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.2 // indirect github.com/mattn/go-isatty v0.0.8 // indirect - github.com/moby/spdystream v0.5.0 // indirect + github.com/moby/spdystream v0.5.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mtibben/percent v0.2.1 // indirect diff --git a/go.sum b/go.sum index d3a268434..a411dd85c 100644 --- a/go.sum +++ b/go.sum @@ -153,8 +153,8 @@ github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= -github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/spdystream v0.5.1 h1:9sNYeYZUcci9R6/w7KDaFWEWeV4LStVG78Mpyq/Zm/Y= +github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= diff --git a/images/samples/go-function-samples/Dockerfile b/images/samples/go-function-samples/Dockerfile index f9341b39e..2d8789343 100644 --- a/images/samples/go-function-samples/Dockerfile +++ b/images/samples/go-function-samples/Dockerfile @@ -1,5 +1,5 @@ ARG PULSAR_IMAGE_TAG -FROM --platform=$BUILDPLATFORM golang:1.25.9-trixie as builder +FROM --platform=$BUILDPLATFORM golang:1.25.10-trixie as builder ARG TARGETOS ARG TARGETARCH diff --git a/images/samples/go-function-samples/func/go.mod b/images/samples/go-function-samples/func/go.mod index f212a5a31..fa39554be 100644 --- a/images/samples/go-function-samples/func/go.mod +++ b/images/samples/go-function-samples/func/go.mod @@ -1,6 +1,6 @@ module github.com/apache/pulsar/pulsar-function-go/examples -go 1.25.9 +go 1.25.10 require github.com/apache/pulsar/pulsar-function-go v0.0.0-20250430085326-611dc3f360b5 diff --git a/operator.Dockerfile b/operator.Dockerfile index 68fb852c3..ec1ab0138 100644 --- a/operator.Dockerfile +++ b/operator.Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.25.9-trixie AS builder +FROM --platform=$BUILDPLATFORM golang:1.25.10-trixie AS builder ARG TARGETOS ARG TARGETARCH diff --git a/redhat.Dockerfile b/redhat.Dockerfile index 680c2d34c..a7cdcbb55 100644 --- a/redhat.Dockerfile +++ b/redhat.Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.25.9-trixie as builder +FROM --platform=$BUILDPLATFORM golang:1.25.10-trixie as builder ARG TARGETOS ARG TARGETARCH