Skip to content

Require to have 'dockercfg' Secret data for PushSecretName #1453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Mar 25, 2015
Merged

Require to have 'dockercfg' Secret data for PushSecretName #1453

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions pkg/build/controller/strategy/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@ import (
// dockerSocketPath is the default path for the Docker socket inside the builder
// container
const (
dockerSocketPath = "/var/run/docker.sock"
dockerSecretMountPath = "/var/run/secrets"
dockerSocketPath = "/var/run/docker.sock"
dockerPushSecretMountPath = "/var/run/secrets/push"
// TODO: The pull secrets is the same as push secret for now.
// This will be replaced using Service Account.
dockerPullSecretMountPath = dockerPushSecretMountPath
)

// setupDockerSocket configures the pod to support the host's Docker socket
Expand Down Expand Up @@ -80,30 +83,23 @@ func setupDockerSecrets(pod *kapi.Pod, pushSecret string) {
Target: kapi.ObjectReference{
Kind: "Secret",
Name: pushSecret,
// TODO: The namespace should not be required here.
// See: https://github.com/GoogleCloudPlatform/kubernetes/pull/5807
// TODO: Remove the namespace once it gets fixed upstream
Namespace: pod.Namespace,
},
},
},
}
volumeMount := kapi.VolumeMount{
Name: pushSecret,
MountPath: filepath.Join(dockerSecretMountPath, "push"),
MountPath: dockerPushSecretMountPath,
ReadOnly: true,
}

glog.V(3).Infof("Adding %s secret to build Pod %s", pushSecret, pod.Name)
glog.V(3).Infof("Installed %s as docker push secret in Pod %s", volumeMount.MountPath, pod.Name)
pod.Spec.Volumes = append(pod.Spec.Volumes, volume)
pod.Spec.Containers[0].VolumeMounts = append(pod.Spec.Containers[0].VolumeMounts, volumeMount)

// TODO: The push && pull secrets are now the same, but the pull secret should
// be delivered by Service Account in future.
// TODO: The Secret.Name must match with one of the Secret.Data[] keys in
// in order to provide the full path to dockercfg. If it does not, then
// the builder fail to find the dockercfg
pod.Spec.Containers[0].Env = append(pod.Spec.Containers[0].Env, []kapi.EnvVar{
{Name: "PUSH_DOCKERCFG_PATH", Value: filepath.Join(volumeMount.MountPath, pushSecret)},
{Name: "PULL_DOCKERCFG_PATH", Value: filepath.Join(volumeMount.MountPath, pushSecret)},
{Name: "PUSH_DOCKERCFG_PATH", Value: filepath.Join(dockerPushSecretMountPath, "dockercfg")},
{Name: "PULL_DOCKERCFG_PATH", Value: filepath.Join(dockerPullSecretMountPath, "dockercfg")},
}...)
}