Merge pull request #17104 from deads2k/build-08-dep-snip

Automatic merge from submit-queue.

remove bad builder dependencies

This removes builder dependencies from origin code.

@openshift/sig-master @bparees

Author: openshift-merge-robot

hack/import-restrictions.json

@@ -22,9 +22,7 @@
     ],
     "ignoredSubTrees": [
       "github.com/openshift/origin/pkg/build/builder",
-      "github.com/openshift/origin/pkg/cmd/infra/builder",
-      "github.com/openshift/origin/pkg/oc/cli/secrets",
-      "github.com/openshift/origin/pkg/build/controller/strategy"
+      "github.com/openshift/origin/pkg/cmd/infra/builder"
     ],
     "forbiddenImportPackageRoots": [
       "github.com/openshift/origin/pkg/build/builder"

pkg/build/controller/strategy/util.go

@@ -16,7 +16,6 @@ import (
 	"github.com/openshift/origin/pkg/api/apihelpers"
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	buildapiv1 "github.com/openshift/origin/pkg/build/apis/build/v1"
-	"github.com/openshift/origin/pkg/build/builder/cmd/dockercfg"
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	"github.com/openshift/origin/pkg/version"
 )
@@ -159,15 +158,15 @@ func setupDockerSecrets(pod *v1.Pod, container *v1.Container, pushSecret, pullSe
 	if pushSecret != nil {
 		mountSecretVolume(pod, container, pushSecret.Name, DockerPushSecretMountPath, "push")
 		container.Env = append(container.Env, []v1.EnvVar{
-			{Name: dockercfg.PushAuthType, Value: DockerPushSecretMountPath},
+			{Name: "PUSH_DOCKERCFG_PATH", Value: DockerPushSecretMountPath},
 		}...)
 		glog.V(3).Infof("%s will be used for docker push in %s", DockerPushSecretMountPath, pod.Name)
 	}
 
 	if pullSecret != nil {
 		mountSecretVolume(pod, container, pullSecret.Name, DockerPullSecretMountPath, "pull")
 		container.Env = append(container.Env, []v1.EnvVar{
-			{Name: dockercfg.PullAuthType, Value: DockerPullSecretMountPath},
+			{Name: "PULL_DOCKERCFG_PATH", Value: DockerPullSecretMountPath},
 		}...)
 		glog.V(3).Infof("%s will be used for docker pull in %s", DockerPullSecretMountPath, pod.Name)
 	}
@@ -179,7 +178,7 @@ func setupDockerSecrets(pod *v1.Pod, container *v1.Container, pushSecret, pullSe
 		mountPath := filepath.Join(SourceImagePullSecretMountPath, strconv.Itoa(i))
 		mountSecretVolume(pod, container, imageSource.PullSecret.Name, mountPath, fmt.Sprintf("%s%d", "source-image", i))
 		container.Env = append(container.Env, []v1.EnvVar{
-			{Name: fmt.Sprintf("%s%d", dockercfg.PullSourceAuthType, i), Value: mountPath},
+			{Name: fmt.Sprintf("%s%d", "PULL_SOURCE_DOCKERCFG_PATH_", i), Value: mountPath},
 		}...)
 		glog.V(3).Infof("%s will be used for docker pull in %s", mountPath, pod.Name)
 	}

pkg/oc/cli/secrets/subcommand.go

@@ -7,23 +7,22 @@ import (
 	"k8s.io/kubernetes/pkg/kubectl/cmd/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 
-	"github.com/openshift/origin/pkg/build/builder/cmd/scmauth"
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
 const SecretsRecommendedName = "secrets"
 
 const (
 	// SourceUsername is the key of the optional username for basic authentication subcommand
-	SourceUsername = scmauth.UsernameSecret
+	SourceUsername = "username"
 	// SourcePassword is the key of the optional password or token for basic authentication subcommand
-	SourcePassword = scmauth.PasswordSecret
+	SourcePassword = "password"
 	// SourceCertificate is the key of the optional certificate authority for basic authentication subcommand
-	SourceCertificate = scmauth.CACertName
+	SourceCertificate = "ca.crt"
 	// SourcePrivateKey is the key of the required SSH private key for SSH authentication subcommand
-	SourcePrivateKey = scmauth.SSHPrivateKeyMethodName
+	SourcePrivateKey = "ssh-privatekey"
 	// SourceGitconfig is the key of the optional gitconfig content for both basic and SSH authentication subcommands
-	SourceGitConfig = scmauth.GitConfigName
+	SourceGitConfig = ".gitconfig"
 )
 
 var (