Repository: code-ready/crc
Pull request #3044 (2022-03-03 07:29:32)

Update admin helper and libvirt driver

openshift-ci[bot]: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/code-ready/crc/pull/3044#" title="Author self-approved">praveenkumar</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=code-ready%2Fcrc).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[OWNERS](https://github.com/code-ready/crc/blob/main/OWNERS)~~ [praveenkumar]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->
openshift-ci[bot]: @praveenkumar: The following test **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
ci/prow/integration-crc | 98c05fe7082b845f5f755bb40323db8b9b769136 | [link](https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/code-ready_crc/3044/pull-ci-code-ready-crc-main-integration-crc/1499285840365359104) | true | `/test integration-crc`

[Full PR test history](https://prow.ci.openshift.org/pr-history?org=code-ready&repo=crc&pr=3044). [Your PR dashboard](https://prow.ci.openshift.org/pr?query=is:pr+state:open+author:praveenkumar).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
openshift-ci[bot]: @praveenkumar: The following tests **failed**, say `/retest` to rerun all failed tests or `/retest-required` to rerun all mandatory failed tests:

Test name | Commit | Details | Required | Rerun command
--- | --- | --- | --- | ---
ci/prow/integration-crc | 98c05fe7082b845f5f755bb40323db8b9b769136 | [link](https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/code-ready_crc/3044/pull-ci-code-ready-crc-main-integration-crc/1499285840365359104) | true | `/test integration-crc`
ci/prow/e2e-crc | 98c05fe7082b845f5f755bb40323db8b9b769136 | [link](https://prow.ci.openshift.org/view/gs/origin-ci-test/pr-logs/pull/code-ready_crc/3044/pull-ci-code-ready-crc-main-e2e-crc/1499285840281473024) | true | `/test e2e-crc`

[Full PR test history](https://prow.ci.openshift.org/pr-history?org=code-ready&repo=crc&pr=3044). [Your PR dashboard](https://prow.ci.openshift.org/pr?query=is:pr+state:open+author:praveenkumar).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->

Patch:
diff --git a/Makefile b/Makefile
index bc2669f25..8141b1efc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ SHELL := /bin/bash
 OPENSHIFT_VERSION ?= 4.9.18
 PODMAN_VERSION ?= 3.4.4
 BUNDLE_EXTENSION = crcbundle
-CRC_VERSION = 1.99.3
+CRC_VERSION = 1.99.4
 COMMIT_SHA=$(shell git rev-parse --short HEAD)
 MACOS_INSTALL_PATH = /Applications/CodeReady Containers.app/Contents/Resources
 CONTAINER_RUNTIME ?= podman
diff --git a/cmd/crc/cmd/version.go b/cmd/crc/cmd/version.go
index fdaa24e32..0f0fa21b5 100644
--- a/cmd/crc/cmd/version.go
+++ b/cmd/crc/cmd/version.go
@@ -6,7 +6,6 @@ import (
 	"os"
 
 	crcConfig "github.com/code-ready/crc/pkg/crc/config"
-	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/logging"
 	crcversion "github.com/code-ready/crc/pkg/crc/version"
 	"github.com/spf13/cobra"
@@ -34,22 +33,18 @@ func runPrintVersion(writer io.Writer, version *version, outputFormat string) er
 }
 
 type version struct {
-	Version             string `json:"version"`
-	Commit              string `json:"commit"`
-	OpenshiftVersion    string `json:"openshiftVersion"`
-	InstalledBundlePath string `json:"installedBundlePath,omitempty"`
+	Version          string `json:"version"`
+	Commit           string `json:"commit"`
+	OpenshiftVersion string `json:"openshiftVersion"`
+	PodmanVersion    string `json:"podmanVersion"`
 }
 
 func defaultVersion() *version {
-	var installedBundlePath string
-	if crcversion.IsInstaller() {
-		installedBundlePath = constants.GetDefaultBundlePath(crcConfig.GetPreset(config))
-	}
 	return &version{
-		Version:             crcversion.GetCRCVersion(),
-		Commit:              crcversion.GetCommitSha(),
-		OpenshiftVersion:    crcversion.GetBundleVersion(),
-		InstalledBundlePath: installedBundlePath,
+		Version:          crcversion.GetCRCVersion(),
+		Commit:           crcversion.GetCommitSha(),
+		OpenshiftVersion: crcversion.GetBundleVersion(),
+		PodmanVersion:    crcversion.GetPodmanVersion(),
 	}
 }
 
@@ -63,15 +58,9 @@ func (v *version) prettyPrintTo(writer io.Writer) error {
 }
 
 func (v *version) lines() []string {
-	var bundleStatus string
-	switch {
-	case v.InstalledBundlePath != "":
-		bundleStatus = fmt.Sprintf("bundle installed at %s", v.InstalledBundlePath)
-	default:
-		bundleStatus = "not embedded in executable"
-	}
 	return []string{
 		fmt.Sprintf("CodeReady Containers version: %s+%s\n", v.Version, v.Commit),
-		fmt.Sprintf("OpenShift version: %s (%s)\n", v.OpenshiftVersion, bundleStatus),
+		fmt.Sprintf("OpenShift version: %s\n", v.OpenshiftVersion),
+		fmt.Sprintf("Podman version: %s\n", v.PodmanVersion),
 	}
 }
diff --git a/images/rpmbuild/Containerfile.in b/images/rpmbuild/Containerfile.in
index 4b5f54335..ae34061ed 100644
--- a/images/rpmbuild/Containerfile.in
+++ b/images/rpmbuild/Containerfile.in
@@ -1,8 +1,8 @@
 FROM quay.io/centos/centos:stream8
 WORKDIR $APP_ROOT/src
 RUN yum -y install git-core rpm-build dnf-plugins-core 'dnf-command(builddep)' \
-        https://github.com/code-ready/admin-helper/releases/download/v0.0.9/crc-admin-helper-0.0.9-1.el8.x86_64.rpm \
-	https://github.com/code-ready/machine-driver-libvirt/releases/download/0.13.1/crc-driver-libvirt-0.13.1-1.el8.x86_64.rpm
+        https://github.com/code-ready/admin-helper/releases/download/0.0.10/crc-admin-helper-0.0.10-1.el8.x86_64.rpm \
+	https://github.com/code-ready/machine-driver-libvirt/releases/download/0.13.2/crc-driver-libvirt-0.13.2-1.el8.x86_64.rpm
 COPY . .
 RUN mkdir -p ~/rpmbuild/SOURCES/ && \
     git archive --format=tar --prefix=crc-__VERSION__-__OPENSHIFT_VERSION__/ HEAD | gzip >~/rpmbuild/SOURCES/crc-__VERSION__.tar.gz
diff --git a/pkg/crc/api/client/types.go b/pkg/crc/api/client/types.go
index 07f751bf6..5d78050e9 100644
--- a/pkg/crc/api/client/types.go
+++ b/pkg/crc/api/client/types.go
@@ -9,6 +9,7 @@ type VersionResult struct {
 	CrcVersion       string
 	CommitSha        string
 	OpenshiftVersion string
+	PodmanVersion    string
 }
 
 type StartResult struct {
diff --git a/pkg/crc/api/handlers.go b/pkg/crc/api/handlers.go
index 6521c02e5..d356b5afa 100644
--- a/pkg/crc/api/handlers.go
+++ b/pkg/crc/api/handlers.go
@@ -124,6 +124,7 @@ func (h *Handler) GetVersion(c *context) error {
 		CrcVersion:       version.GetCRCVersion(),
 		CommitSha:        version.GetCommitSha(),
 		OpenshiftVersion: version.GetBundleVersion(),
+		PodmanVersion:    version.GetPodmanVersion(),
 	})
 }
 
diff --git a/pkg/crc/constants/constants.go b/pkg/crc/constants/constants.go
index 6f393f0fc..3b7fccc66 100644
--- a/pkg/crc/constants/constants.go
+++ b/pkg/crc/constants/constants.go
@@ -24,7 +24,7 @@ const (
 	DaemonLogFile             = "crcd.log"
 	CrcLandingPageURL         = "https://cloud.redhat.com/openshift/create/local" // #nosec G101
 	DefaultPodmanURLBase      = "https://storage.googleapis.com/libpod-master-releases"
-	DefaultAdminHelperCliBase = "https://github.com/code-ready/admin-helper/releases/download/v0.0.8"
+	DefaultAdminHelperCliBase = "https://github.com/code-ready/admin-helper/releases/download/0.0.10"
 	CRCMacTrayDownloadURL     = "https://github.com/code-ready/tray-electron/releases/download/%s/crc-tray-macos.tar.gz"
 	CRCWindowsTrayDownloadURL = "https://github.com/code-ready/tray-electron/releases/download/%s/crc-tray-windows.zip"
 	DefaultContext            = "admin"
diff --git a/pkg/crc/machine/libvirt/constants.go b/pkg/crc/machine/libvirt/constants.go
index 22e59857f..6cddcddf5 100644
--- a/pkg/crc/machine/libvirt/constants.go
+++ b/pkg/crc/machine/libvirt/constants.go
@@ -17,7 +17,7 @@ const (
 
 const (
 	MachineDriverCommand = "crc-driver-libvirt"
-	MachineDriverVersion = "0.13.1"
+	MachineDriverVersion = "0.13.2"
 )
 
 var (
diff --git a/pkg/crc/version/version.go b/pkg/crc/version/version.go
index ab30251ee..d5c5532e8 100644
--- a/pkg/crc/version/version.go
+++ b/pkg/crc/version/version.go
@@ -43,7 +43,7 @@ var (
 const (
 	releaseInfoLink = "https://developers.redhat.com/content-gateway/rest/mirror/pub/openshift-v4/clients/crc/latest/release-info.json"
 	// Tray version to be embedded in executable
-	crcTrayElectronVersion = "1.1.2"
+	crcTrayElectronVersion = "1.1.3"
 )
 
 type CrcReleaseInfo struct {


Test patch:
diff --git a/cmd/crc/cmd/version_test.go b/cmd/crc/cmd/version_test.go
index de449fb98..059893ba3 100644
--- a/cmd/crc/cmd/version_test.go
+++ b/cmd/crc/cmd/version_test.go
@@ -10,25 +10,26 @@ import (
 func TestPlainVersion(t *testing.T) {
 	out := new(bytes.Buffer)
 	assert.NoError(t, runPrintVersion(out, &version{
-		Version:             "1.13",
-		Commit:              "aabbcc",
-		OpenshiftVersion:    "4.5.4",
-		InstalledBundlePath: "",
+		Version:          "1.13",
+		Commit:           "aabbcc",
+		OpenshiftVersion: "4.5.4",
+		PodmanVersion:    "3.4.4",
 	}, ""))
 	assert.Equal(t, `CodeReady Containers version: 1.13+aabbcc
-OpenShift version: 4.5.4 (not embedded in executable)
+OpenShift version: 4.5.4
+Podman version: 3.4.4
 `, out.String())
 }
 
 func TestJsonVersion(t *testing.T) {
 	out := new(bytes.Buffer)
 	assert.NoError(t, runPrintVersion(out, &version{
-		Version:             "1.13",
-		Commit:              "aabbcc",
-		OpenshiftVersion:    "4.5.4",
-		InstalledBundlePath: "",
+		Version:          "1.13",
+		Commit:           "aabbcc",
+		OpenshiftVersion: "4.5.4",
+		PodmanVersion:    "3.4.4",
 	}, "json"))
 
-	expected := `{"version": "1.13", "commit": "aabbcc", "openshiftVersion": "4.5.4"}`
+	expected := `{"version": "1.13", "commit": "aabbcc", "openshiftVersion": "4.5.4", "podmanVersion": "3.4.4"}`
 	assert.JSONEq(t, expected, out.String())
 }
diff --git a/pkg/crc/api/api_client_test.go b/pkg/crc/api/api_client_test.go
index 497e53f50..696d8da0e 100644
--- a/pkg/crc/api/api_client_test.go
+++ b/pkg/crc/api/api_client_test.go
@@ -52,6 +52,7 @@ func TestVersion(t *testing.T) {
 			CrcVersion:       version.GetCRCVersion(),
 			OpenshiftVersion: version.GetBundleVersion(),
 			CommitSha:        version.GetCommitSha(),
+			PodmanVersion:    version.GetPodmanVersion(),
 		},
 		vr,
 	)
diff --git a/pkg/crc/api/api_http_test.go b/pkg/crc/api/api_http_test.go
index 38aef659a..a3637981d 100644
--- a/pkg/crc/api/api_http_test.go
+++ b/pkg/crc/api/api_http_test.go
@@ -265,7 +265,7 @@ var testCases = []testCase{
 	// version
 	{
 		request:  get("version"),
-		response: jSon(fmt.Sprintf(`{"CrcVersion":"%s","CommitSha":"%s","OpenshiftVersion":"%s"}`, version.GetCRCVersion(), version.GetCommitSha(), version.GetBundleVersion())),
+		response: jSon(fmt.Sprintf(`{"CrcVersion":"%s","CommitSha":"%s","OpenshiftVersion":"%s","PodmanVersion":"%s"}`, version.GetCRCVersion(), version.GetCommitSha(), version.GetBundleVersion(), version.GetPodmanVersion())),
 	},
 
 	// version never fails