Merge pull request #19561 from mfojtik/up-21-registry-volume

up: fix mount-path for docker registry

Author: openshift-merge-robot

pkg/oc/bootstrap/clusteradd/components/registry/registry_install.go

@@ -5,15 +5,18 @@ import (
 	"os"
 	"path"
 
+	"github.com/golang/glog"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusteradd/componentinstall"
 	"github.com/openshift/origin/pkg/oc/bootstrap/clusterup/kubeapiserver"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/dockerhelper"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/host"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/run"
 	"github.com/openshift/origin/pkg/oc/errors"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes"
 )
 
 const (
@@ -31,6 +34,24 @@ func (r *RegistryComponentOptions) Name() string {
 	return "openshift-image-registry"
 }
 
+// ensureRemoteRegistryStoragePermissions ensures the remote host directory for registry storage have write access permissions
+// so the registry can successfully write data into it.
+// TODO: This is a remote docker snowflake
+func (r *RegistryComponentOptions) ensureRemoteRegistryStoragePermissions(dir string, dockerClient dockerhelper.Interface) error {
+	glog.V(5).Infof("Ensuring the write permissions in remote directory %s", dir)
+	_, rc, err := run.NewRunHelper(dockerhelper.NewHelper(dockerClient)).New().
+		Image(r.InstallContext.ClientImage()).
+		DiscardContainer().
+		Privileged().
+		Bind(fmt.Sprintf("%s:/pv", dir)).
+		Entrypoint("/bin/bash").
+		Command("-c", "mkdir -p /pv/registry && chmod 0777 /pv/registry").Run()
+	if rc != 0 {
+		return fmt.Errorf("command returning non-zero exit code: %d", rc)
+	}
+	return err
+}
+
 func (r *RegistryComponentOptions) Install(dockerClient dockerhelper.Interface, logdir string) error {
 	kubeAdminClient, err := kubernetes.NewForConfig(r.InstallContext.ClusterAdminClientConfig())
 	if err != nil {
@@ -55,6 +76,14 @@ func (r *RegistryComponentOptions) Install(dockerClient dockerhelper.Interface,
 	if len(os.Getenv("DOCKER_HOST")) > 0 {
 		baseDir = path.Join(host.RemoteHostOriginDir, r.InstallContext.BaseDir())
 	}
+	registryStorageDir := path.Join(baseDir, "openshift.local.pv", "registry")
+
+	// If docker is on remote host, ensure the permissions for registry
+	if len(os.Getenv("DOCKER_HOST")) > 0 {
+		if err := r.ensureRemoteRegistryStoragePermissions(registryStorageDir, dockerClient); err != nil {
+			return errors.NewError("error ensuring remote host registry directory permissions").WithCause(err)
+		}
+	}
 
 	masterConfigDir := path.Join(baseDir, kubeapiserver.KubeAPIServerDirName)
 	flags := []string{
@@ -67,7 +96,7 @@ func (r *RegistryComponentOptions) Install(dockerClient dockerhelper.Interface,
 		fmt.Sprintf("--cluster-ip=%s", RegistryServiceClusterIP),
 		fmt.Sprintf("--config=%s", path.Join(masterConfigDir, "admin.kubeconfig")),
 		fmt.Sprintf("--images=%s", r.InstallContext.ImageFormat()),
-		fmt.Sprintf("--mount-host=%s", path.Join(r.InstallContext.BaseDir(), "openshift.local.pv", "registry")),
+		fmt.Sprintf("--mount-host=%s", registryStorageDir),
 	}
 	_, rc, err := imageRunHelper.Image(r.InstallContext.ClientImage()).
 		Privileged().

pkg/oc/bootstrap/docker/down.go

@@ -2,7 +2,6 @@ package docker
 
 import (
 	"fmt"
-	"io"
 	"strconv"
 	"strings"
 
@@ -30,7 +29,7 @@ type ClientStopConfig struct {
 }
 
 // NewCmdDown creates a command that stops OpenShift
-func NewCmdDown(name, fullName string, out io.Writer) *cobra.Command {
+func NewCmdDown(name, fullName string) *cobra.Command {
 	config := &ClientStopConfig{}
 	cmd := &cobra.Command{
 		Use:     name,

pkg/oc/cli/cli.go

@@ -108,7 +108,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
 				cmd.NewCmdProject(fullName+" project", f, out),
 				cmd.NewCmdProjects(fullName, f, out),
 				cmd.NewCmdExplain(fullName, f, out, errout),
-				cluster.NewCmdCluster(cluster.ClusterRecommendedName, fullName+" "+cluster.ClusterRecommendedName, f, in, out, errout),
+				cluster.NewCmdCluster(cluster.ClusterRecommendedName, fullName+" "+cluster.ClusterRecommendedName, f, out, errout),
 			},
 		},
 		{

pkg/oc/cli/cmd/cluster/cluster.go

@@ -32,7 +32,7 @@ var (
 		routing suffix, use the --routing-suffix flag.`)
 )
 
-func NewCmdCluster(name, fullName string, f *clientcmd.Factory, in io.Reader, out, errout io.Writer) *cobra.Command {
+func NewCmdCluster(name, fullName string, f *clientcmd.Factory, out, errout io.Writer) *cobra.Command {
 	// Parent command to which all subcommands are added.
 	cmds := &cobra.Command{
 		Use:   fmt.Sprintf("%s ACTION", name),
@@ -45,7 +45,7 @@ func NewCmdCluster(name, fullName string, f *clientcmd.Factory, in io.Reader, ou
 
 	cmds.AddCommand(clusterAdd)
 	cmds.AddCommand(docker.NewCmdUp(docker.CmdUpRecommendedName, fullName+" "+docker.CmdUpRecommendedName, out, errout, clusterAdd))
-	cmds.AddCommand(docker.NewCmdDown(docker.CmdDownRecommendedName, fullName+" "+docker.CmdDownRecommendedName, out))
+	cmds.AddCommand(docker.NewCmdDown(docker.CmdDownRecommendedName, fullName+" "+docker.CmdDownRecommendedName))
 	cmds.AddCommand(docker.NewCmdStatus(docker.CmdStatusRecommendedName, fullName+" "+docker.CmdStatusRecommendedName, f, out))
 	return cmds
 }