From 77924539483832c35d555e54b6d94e165aa2fae3 Mon Sep 17 00:00:00 2001 From: Zoran Regvart Date: Tue, 29 Oct 2024 12:50:05 +0100 Subject: [PATCH 1/2] Use 1.22.7 in Dockerfile The `Dockerfile` is mostly unused, but the version will be flagged as incompatible if not set to 1.22.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 78f7e83..501a005 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM docker.io/library/golang:1.21@sha256:2ff79bcdaff74368a9fdcb06f6599e54a71caf520fd2357a55feddd504bcaffb as builder +FROM docker.io/library/golang:1.22.7 as builder WORKDIR /workspace # Copy the Go Modules manifests From fa593c25942416f7bef9e673cdb261f6ab176458 Mon Sep 17 00:00:00 2001 From: Zoran Regvart Date: Tue, 29 Oct 2024 12:52:05 +0100 Subject: [PATCH 2/2] Add allow comment This allows the version to be not as specific as required by the version check[1] [1] https://github.com/enterprise-contract/github-workflows/tree/main/golang-version-check --- api/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/go.mod b/api/go.mod index 8604ccb..5b699d8 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/enterprise-contract/enterprise-contract-controller/api -go 1.22 +go 1.22 // allow require ( k8s.io/apiextensions-apiserver v0.29.9