public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

K8s: Fix the gitVersion response (required for kubectl) (#98571)

Browse Source
This commit is contained in:
Ryan McKinley
2025-01-07 11:43:19 +02:00
committed by GitHub
parent 79d565f285
commit b506fcb11c
3 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/apiserver/builder/helper.go
+16 -1
View File
@@ -232,7 +232,22 @@ func SetupConfig(
serverConfig.BuildHandlerChainFunc = buildHandlerChainFunc
}
serverConfig.EffectiveVersion = utilversion.DefaultKubeEffectiveVersion()
v := utilversion.DefaultKubeEffectiveVersion()
patchver := 0 // required for semver
info := v.BinaryVersion().Info()
info.BuildDate = time.Unix(buildTimestamp, 0).UTC().Format(time.RFC3339)
info.GitVersion = fmt.Sprintf("%s.%s.%d+grafana-v%s", info.Major, info.Minor, patchver, buildVersion)
info.GitCommit = fmt.Sprintf("%s@%s", buildBranch, buildCommit)
info.GitTreeState = fmt.Sprintf("grafana v%s", buildVersion)
info2 := v.EmulationVersion().Info()
info2.BuildDate = info.BuildDate
info2.GitVersion = fmt.Sprintf("%s.%s.%d+grafana-v%s", info2.Major, info2.Minor, patchver, buildVersion)
info2.GitCommit = info.GitCommit
info2.GitTreeState = info.GitTreeState
serverConfig.EffectiveVersion = v
if err := AddPostStartHooks(serverConfig, builders); err != nil {
return err