From fce8a7a1af971457b01f2b5fbc3f0ea733391893 Mon Sep 17 00:00:00 2001 From: clyang82 Date: Tue, 9 Dec 2025 22:49:23 +0800 Subject: [PATCH 1/3] Upgrade golang to 1.25.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 Signed-off-by: clyang82 --- Containerfile.konflux | 2 +- Dockerfile.ocp | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile.konflux b/Containerfile.konflux index 120720570871b..265e711bd28be 100644 --- a/Containerfile.konflux +++ b/Containerfile.konflux @@ -1,5 +1,5 @@ # Golang build container -FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 AS builder +FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 AS builder WORKDIR $GOPATH/src/github.com/grafana/grafana diff --git a/Dockerfile.ocp b/Dockerfile.ocp index 2fea2c917f037..af42cba85ad5e 100644 --- a/Dockerfile.ocp +++ b/Dockerfile.ocp @@ -1,5 +1,5 @@ # Golang build container -FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 AS builder +FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 AS builder WORKDIR $GOPATH/src/github.com/grafana/grafana diff --git a/go.mod b/go.mod index 0471fb7aea1d0..9e90c853f7789 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/grafana -go 1.23.2 +go 1.25.3 // Override docker/docker to avoid: // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires From aaeb8be77d08bddcf68d5851b37a553777aa6a60 Mon Sep 17 00:00:00 2001 From: clyang82 Date: Tue, 9 Dec 2025 22:57:31 +0800 Subject: [PATCH 2/3] Upgrade golang to 1.25.3 Signed-off-by: clyang82 --- go.work | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.work b/go.work index bc7ef5ae719a0..459274d3a1378 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.23.2 +go 1.25.3 use ( . From 45ce0bc3c84f3a34ad871d41812af3c658a78f7f Mon Sep 17 00:00:00 2001 From: clyang82 Date: Thu, 11 Dec 2025 10:39:36 +0800 Subject: [PATCH 3/3] increase memory limits to avoid OOM Signed-off-by: clyang82 --- .tekton/glo-grafana-globalhub-1-6-pull-request.yaml | 5 +++++ .tekton/glo-grafana-globalhub-1-6-push.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.tekton/glo-grafana-globalhub-1-6-pull-request.yaml b/.tekton/glo-grafana-globalhub-1-6-pull-request.yaml index 60ad2d57c298a..9b2a5088392ff 100644 --- a/.tekton/glo-grafana-globalhub-1-6-pull-request.yaml +++ b/.tekton/glo-grafana-globalhub-1-6-pull-request.yaml @@ -43,6 +43,11 @@ spec: value: "true" - name: prefetch-input value: '[ {"type": "gomod", "path": "."} ]' + taskRunSpecs: + - pipelineTaskName: build-source-image + computeResources: + limits: + memory: 4Gi pipelineRef: resolver: git params: diff --git a/.tekton/glo-grafana-globalhub-1-6-push.yaml b/.tekton/glo-grafana-globalhub-1-6-push.yaml index ed9e1da2f0738..f25e815585614 100644 --- a/.tekton/glo-grafana-globalhub-1-6-push.yaml +++ b/.tekton/glo-grafana-globalhub-1-6-push.yaml @@ -54,6 +54,11 @@ spec: # Will mention the user in the slack message when the pipeline run failed; this is not required. # Please make sure replace the value with component owner's slack member id. value: "S09JCE3DF9N" + taskRunSpecs: + - pipelineTaskName: build-source-image + computeResources: + limits: + memory: 4Gi pipelineRef: resolver: git params: