Skip to content

Bug: 1686556: Symlink /root/.docker/config.json to kubelet auth #535

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-merge-robot merged 1 commit into from
Mar 9, 2019
Merged

Bug: 1686556: Symlink /root/.docker/config.json to kubelet auth #535

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
23 changes: 23 additions & 0 deletions pkg/controller/template/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/ghodss/yaml"
"github.com/golang/glog"
mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
"github.com/openshift/machine-config-operator/lib/resourcemerge"
"github.com/openshift/machine-config-operator/pkg/controller/common"
"github.com/openshift/machine-config-operator/pkg/version"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -73,7 +74,11 @@ func generateMachineConfigs(config *RenderConfig, templateDir string) ([]*mcfgv1
if err != nil {
return nil, fmt.Errorf("failed to create MachineConfig for role %s: %v", role, err)
}
if len(roleConfigs) > 0 {
injectDockerConfigKubeletAuthSymlink(roleConfigs[len(roleConfigs)-1])
}
cfgs = append(cfgs, roleConfigs...)

}

// tag all the machineconfigs with version of the controller.
Expand All @@ -87,6 +92,24 @@ func generateMachineConfigs(config *RenderConfig, templateDir string) ([]*mcfgv1
return cfgs, nil
}

// injectDockerConfigKubeletAuthSymlink is a hack to symlink /var/lib/kubelet/auth.json -> ~/.docker/config.json
// See https://bugzilla.redhat.com/show_bug.cgi?id=1686556
// https://github.com/containers/skopeo/pull/612
func injectDockerConfigKubeletAuthSymlink(cfg *mcfgv1.MachineConfig) {
authLink := ignv2_2types.Link{
Node: ignv2_2types.Node{
Filesystem: "root",
Path: "/root/.docker/config.json",
Overwrite: resourcemerge.BoolPtr(false),
},
LinkEmbedded1: ignv2_2types.LinkEmbedded1{
Hard: false,
Target: "/var/lib/kubelet/config.json",
},
}
cfg.Spec.Config.Storage.Links = append(cfg.Spec.Config.Storage.Links, authLink)
}

// GenerateMachineConfigsForRole creates MachineConfigs for the role provided
func GenerateMachineConfigsForRole(config *RenderConfig, role string, path string) ([]*mcfgv1.MachineConfig, error) {
infos, err := ioutil.ReadDir(path)
Expand Down