diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-16 04:06:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 04:06:30 +0200 |
| commit | 26049193e0829c2ac841ff852732ddb4223a01fb (patch) | |
| tree | 47ec84131bf8164941e5def9c347210fefc1fc5b /pkg/api/handlers/compat/version.go | |
| parent | 32b49463d9f38e6bdf4ad521a4b11fa17d836050 (diff) | |
| parent | 8a8bae8299dff8d10c0a2f5873190e19a83ea01c (diff) | |
| download | podman-26049193e0829c2ac841ff852732ddb4223a01fb.tar.gz podman-26049193e0829c2ac841ff852732ddb4223a01fb.tar.bz2 podman-26049193e0829c2ac841ff852732ddb4223a01fb.zip | |
Merge pull request #7642 from jwhonce/issues/7327-2
Refactor API version values
Diffstat (limited to 'pkg/api/handlers/compat/version.go')
| -rw-r--r-- | pkg/api/handlers/compat/version.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/api/handlers/compat/version.go b/pkg/api/handlers/compat/version.go index e12c7cefa..92900b75d 100644 --- a/pkg/api/handlers/compat/version.go +++ b/pkg/api/handlers/compat/version.go @@ -30,6 +30,7 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) { utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrapf(err, "Failed to obtain system memory info")) return } + components := []docker.ComponentVersion{{ Name: "Podman Engine", Version: versionInfo.Version, @@ -46,6 +47,9 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) { }, }} + apiVersion := utils.APIVersion[utils.CompatTree][utils.CurrentAPIVersion] + minVersion := utils.APIVersion[utils.CompatTree][utils.MinimalAPIVersion] + utils.WriteResponse(w, http.StatusOK, entities.ComponentVersion{ Version: docker.Version{ Platform: struct { @@ -53,7 +57,7 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) { }{ Name: fmt.Sprintf("%s/%s/%s-%s", goRuntime.GOOS, goRuntime.GOARCH, infoData.Host.Distribution.Distribution, infoData.Host.Distribution.Version), }, - APIVersion: components[0].Details["APIVersion"], + APIVersion: fmt.Sprintf("%d.%d", apiVersion.Major, apiVersion.Minor), Arch: components[0].Details["Arch"], BuildTime: components[0].Details["BuildTime"], Components: components, @@ -61,7 +65,7 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) { GitCommit: components[0].Details["GitCommit"], GoVersion: components[0].Details["GoVersion"], KernelVersion: components[0].Details["KernelVersion"], - MinAPIVersion: components[0].Details["MinAPIVersion"], + MinAPIVersion: fmt.Sprintf("%d.%d", minVersion.Major, minVersion.Minor), Os: components[0].Details["Os"], Version: components[0].Version, }}) |