From e035e6f9fb65984e6770c7396b5cca4a3aee8408 Mon Sep 17 00:00:00 2001 From: clyang82 Date: Tue, 9 Dec 2025 16:40:18 +0800 Subject: [PATCH 1/2] Upgrade golang to 1.25.3 Signed-off-by: clyang82 --- Containerfile.konflux | 2 +- Dockerfile.ocp | 2 +- go.mod | 2 +- go.work | 2 +- 4 files changed, 4 insertions(+), 4 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 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 4d3d8fc4984ad61c4bce65a75a9fed52ff7fd45b Mon Sep 17 00:00:00 2001 From: clyang82 Date: Thu, 11 Dec 2025 09:52:34 +0800 Subject: [PATCH 2/2] increase memory limits to avoid OOM Signed-off-by: clyang82 --- .tekton/glo-grafana-globalhub-1-7-pull-request.yaml | 5 +++++ .tekton/glo-grafana-globalhub-1-7-push.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.tekton/glo-grafana-globalhub-1-7-pull-request.yaml b/.tekton/glo-grafana-globalhub-1-7-pull-request.yaml index b4601839dc53c..2e62e9f7c0192 100644 --- a/.tekton/glo-grafana-globalhub-1-7-pull-request.yaml +++ b/.tekton/glo-grafana-globalhub-1-7-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: 2Gi pipelineRef: resolver: git params: diff --git a/.tekton/glo-grafana-globalhub-1-7-push.yaml b/.tekton/glo-grafana-globalhub-1-7-push.yaml index 4b3d26d4e8798..ac5ee7a0e677d 100644 --- a/.tekton/glo-grafana-globalhub-1-7-push.yaml +++ b/.tekton/glo-grafana-globalhub-1-7-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: 2Gi pipelineRef: resolver: git params: