Allow to override the Golang version from the config files

cardil · cardil · commit 9513c95b4632 · 2025-10-24T14:24:53.000+02:00
diff --git a/config/backstage-plugins.yaml b/config/backstage-plugins.yaml
@@ -1,6 +1,7 @@
 config:
   branches:
     release-v1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
       openShiftVersions:
diff --git a/config/client.yaml b/config/client.yaml
@@ -1,6 +1,7 @@
 config:
   branches:
     release-v1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
         imageOverrides:
diff --git a/config/eventing-istio.yaml b/config/eventing-istio.yaml
@@ -8,6 +8,7 @@ config:
         version: "4.14"
       promotion: {}
     release-v1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
       openShiftVersions:
diff --git a/config/eventing-kafka-broker.yaml b/config/eventing-kafka-broker.yaml
@@ -14,6 +14,7 @@ config:
       skipDockerFilesMatches:
       - .*hermetic.*
     release-v1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
         javaImages:
diff --git a/config/eventing.yaml b/config/eventing.yaml
@@ -12,6 +12,7 @@ config:
         version: "4.14"
       promotion: {}
     release-v1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
       openShiftVersions:
diff --git a/config/kn-plugin-event.yaml b/config/kn-plugin-event.yaml
@@ -1,6 +1,7 @@
 config:
   branches:
     release-1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
       openShiftVersions:
diff --git a/config/kn-plugin-func.yaml b/config/kn-plugin-func.yaml
@@ -7,6 +7,7 @@ config:
         version: "4.19"
       promotion: {}
     release-v1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
       openShiftVersions:
diff --git a/config/serverless-operator.yaml b/config/serverless-operator.yaml
@@ -38,6 +38,7 @@ config:
         version: "4.14"
       promotion: {}
     release-1.35:
+      golangVersion: "1.24"
       konflux:
         enabled: true
         excludes:
diff --git a/config/serving-net-istio.yaml b/config/serving-net-istio.yaml
@@ -1,6 +1,7 @@
 config:
   branches:
     release-v1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
       openShiftVersions:
diff --git a/config/serving-net-kourier.yaml b/config/serving-net-kourier.yaml
@@ -1,6 +1,7 @@
 config:
   branches:
     release-v1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
       openShiftVersions:
diff --git a/config/serving.yaml b/config/serving.yaml
@@ -13,6 +13,7 @@ config:
       - perf-tests$
       - .*e2e-tls$
     release-v1.15:
+      golangVersion: "1.24"
       konflux:
         enabled: true
       openShiftVersions:
diff --git a/pkg/dockerfilegen/generator.go b/pkg/dockerfilegen/generator.go
@@ -17,6 +17,7 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/openshift-knative/hack/config"
 	"github.com/openshift-knative/hack/pkg/soversion"
 
 	"github.com/coreos/go-semver/semver"
@@ -57,14 +58,11 @@ var (
 
 // GenerateDockerfiles will generate Dockerfile files
 func GenerateDockerfiles(params Params) error {
-	if params.RootDir == "" {
-		return fmt.Errorf("%w: root-dir cannot be empty", ErrBadConf)
-	}
-	if !path.IsAbs(params.Output) {
-		params.Output = path.Join(params.RootDir, params.Output)
-	}
-	if !path.IsAbs(params.ProjectFilePath) {
-		params.ProjectFilePath = path.Join(params.RootDir, params.ProjectFilePath)
+	{
+		var err error
+		if params, err = params.Resolve(); err != nil {
+			return err
+		}
 	}
 
 	if err := os.Chdir(params.RootDir); err != nil {
@@ -150,12 +148,6 @@ func generateDockerfile(params Params, mainPackagesPaths sets.Set[string]) error
 	if err != nil {
 		return err
 	}
-	goVersion := goMod.Go.Version
-
-	// The builder images are distinguished by golang major.minor, so we ignore the rest of the goVersion
-	if strings.Count(goVersion, ".") > 1 {
-		goVersion = strings.Join(strings.Split(goVersion, ".")[0:2], ".")
-	}
 
 	metadata, err := project.ReadMetadataFile(params.ProjectFilePath)
 	if err != nil {
@@ -167,6 +159,11 @@ func generateDockerfile(params Params, mainPackagesPaths sets.Set[string]) error
 		metadata = project.DefaultMetadata()
 	}
 
+	var goVersion string
+	if goVersion, err = resolveGolangVersion(params, goMod, metadata); err != nil {
+		return err
+	}
+
 	rhelVersion := RHEL9
 	templateFilePattern := "dockerfile-templates/rhel-9/*.tmpl"
 	var soVersion string
@@ -400,6 +397,35 @@ func generateDockerfile(params Params, mainPackagesPaths sets.Set[string]) error
 	return nil
 }
 
+func resolveGolangVersion(params Params, goMod *modfile.File, metadata *project.Metadata) (string, error) {
+	goVersion := goMod.Go.Version
+
+	// The builder images are distinguished by golang major.minor, so we ignore the rest of the goVersion
+	if strings.Count(goVersion, ".") > 1 {
+		goVersion = strings.Join(strings.Split(goVersion, ".")[0:2], ".")
+	}
+
+	log.Println("Golang version (from go.mod): ", goVersion)
+
+	cfgYaml, err := config.Configs.ReadFile(fmt.Sprint(params.GetRepoName(goMod), ".yaml"))
+	if err != nil {
+		return "", err
+	}
+	prowcfg, perr := prowgen.UnmarshalConfig(cfgYaml)
+	if perr != nil {
+		return "", perr
+	}
+
+	release := metadata.Project.Tag
+	branch := prowcfg.Config.Branches[release]
+	if branch.GolangVersion != "" {
+		goVersion = branch.GolangVersion
+		log.Println("Golang version (overridden for ", release, "): ", goVersion)
+	}
+
+	return goVersion, nil
+}
+
 func hasVendorFolder(dir string) (bool, error) {
 	info, err := os.Stat(path.Join(dir, "vendor"))
 	if err == nil {
diff --git a/pkg/dockerfilegen/params.go b/pkg/dockerfilegen/params.go
@@ -1,12 +1,14 @@
 package dockerfilegen
 
 import (
+	"fmt"
 	"os"
 	"path"
 
 	"github.com/octago/sflags"
 	"github.com/octago/sflags/gen/gpflag"
 	"github.com/spf13/pflag"
+	"golang.org/x/mod/modfile"
 )
 
 type Params struct {
@@ -20,6 +22,7 @@ type Params struct {
 	DockerfilesBuildDir          string   `json:"dockerfiles-build-dir" desc:"Dockerfiles output directory for build image relative to output flag"`
 	DockerfilesSourceDir         string   `json:"dockerfiles-source-dir" desc:"Dockerfiles output directory for source image relative to output flag"`
 	ProjectFilePath              string   `json:"project-file" desc:"Project metadata file path"`
+	RepoName                     string   `json:"repo-name" desc:"Repository name (implied from go.mod by default)"`
 	DockerfileImageBuilderFmt    string   `json:"dockerfile-image-builder-fmt" desc:"Dockerfile image builder format"`
 	AppFileFmt                   string   `json:"app-file-fmt" desc:"Target application binary path format"`
 	RegistryImageFmt             string   `json:"registry-image-fmt" desc:"Container registry image format"`
@@ -40,6 +43,28 @@ func (p *Params) ConfigureFlags() (*pflag.FlagSet, error) {
 	return fs, nil
 }
 
+func (p *Params) Resolve() (Params, error) {
+	params := *p
+	if p.RootDir == "" {
+		return params, fmt.Errorf("%w: root-dir cannot be empty", ErrBadConf)
+	}
+	if !path.IsAbs(params.Output) {
+		params.Output = path.Join(params.RootDir, params.Output)
+	}
+	if !path.IsAbs(params.ProjectFilePath) {
+		params.ProjectFilePath = path.Join(params.RootDir, params.ProjectFilePath)
+	}
+
+	return params, nil
+}
+
+func (p *Params) GetRepoName(goMod *modfile.File) string {
+	if p.RepoName != "" {
+		return p.RepoName
+	}
+	return path.Base(goMod.Module.Mod.Path)
+}
+
 func DefaultParams(wd string) Params {
 	return Params{
 		RootDir: wd,
diff --git a/pkg/prowgen/prowgen_config.go b/pkg/prowgen/prowgen_config.go
@@ -91,6 +91,7 @@ type Branch struct {
 	SkipE2EMatches         []string    `json:"skipE2EMatches,omitempty" yaml:"skipE2EMatches,omitempty"`
 	SkipDockerFilesMatches []string    `json:"skipDockerFilesMatches,omitempty" yaml:"skipDockerFilesMatches,omitempty"`
 	Konflux                *Konflux    `json:"konflux,omitempty" yaml:"konflux,omitempty"`
+	GolangVersion          string      `json:"golangVersion,omitempty" yaml:"golangVersion,omitempty"`
 
 	// DependabotEnabled enabled if `nil`.
 	DependabotEnabled *bool `json:"dependabotEnabled,omitempty" yaml:"dependabotEnabled,omitempty"`
