Skip to content

Commit

Permalink
Disable the podman remote
Browse files Browse the repository at this point in the history
Since there is issue with podman remote client for each platform
and client is not up to date, it is better to disable this feature
until we have more update from podman team. Recently even podman
remote download urls are not working as expected.
  • Loading branch information
praveenkumar committed Apr 28, 2020
1 parent d9a3953 commit 4597b26
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 19 deletions.
2 changes: 0 additions & 2 deletions cmd/crc-embedder/cmd/embed.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,10 @@ var (
hyperkit.HyperkitDownloadUrl,
constants.GetOcUrlForOs("darwin"),
constants.GetCrcTrayDownloadURL(),
constants.GetPodmanUrlForOs("darwin"),
},
"linux": []string{
libvirt.MachineDriverDownloadUrl,
constants.GetOcUrlForOs("linux"),
constants.GetPodmanUrlForOs("linux"),
},
"windows": []string{
constants.GetOcUrlForOs("windows"),
Expand Down
5 changes: 1 addition & 4 deletions cmd/crc/cmd/podman_env.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"github.com/code-ready/crc/pkg/crc/errors"
"github.com/code-ready/crc/pkg/crc/machine"
"github.com/code-ready/crc/pkg/crc/output"
crcos "github.com/code-ready/crc/pkg/os"
"github.com/code-ready/crc/pkg/os/shell"
"github.com/spf13/cobra"
)
Expand All @@ -17,9 +16,7 @@ var podmanEnvCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {

// See issue #961; Currently does not work on Windows in combination with the CRC vm.
if crcos.CurrentOS() == crcos.WINDOWS {
errors.ExitWithMessage(1, "Currently not supported on this platform.")
}
errors.ExitWithMessage(1, "Currently not supported.")

userShell, err := shell.GetShell(forceShell)
if err != nil {
Expand Down
15 changes: 2 additions & 13 deletions pkg/crc/preflight/preflight_checks_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/code-ready/crc/pkg/crc/oc"
"github.com/code-ready/crc/pkg/crc/podman"
"github.com/code-ready/crc/pkg/embed"
crcos "github.com/code-ready/crc/pkg/os"
)

var genericPreflightChecks = [...]PreflightCheck{
Expand Down Expand Up @@ -82,18 +81,8 @@ func fixOcBinaryCached() error {

// Check if podman binary is cached or not
func checkPodmanBinaryCached() error {

// See issue #961; Currently does not work on Windows in combination with the CRC vm.
if crcos.CurrentOS() == crcos.WINDOWS {
logging.Debug("podman remote currently not supported on this platform")
return nil
}

podman := podman.PodmanCached{}
if !podman.IsCached() {
return errors.New("podman remote binary is not cached")
}
logging.Debug("podman remote binary already cached")
// Disable the podman cache until further notice
logging.Debug("Currently podman remote is not supported")
return nil
}

Expand Down

0 comments on commit 4597b26

Please sign in to comment.