mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 15:05:27 +00:00
kubeadm: modify how component volumes are printed
After the shift for init phases, GetStaticPodSpecs() from app/phases/controlplane/manifests.go gets called on each control-plane component sub-phase. This ends up calling the Printf from AddExtraHostPathMounts() in app/phases/controlplane/volumes.go multiple times printing the same volumes for different components. - Remove the Printf call from AddExtraHostPathMounts(). - Print all volumes for a component in CreateStaticPodFiles() using klog V(2). Perhaps in the future a bigger refactor is needed here were a single control-plane component spec can be requested instead of a map[string]v1.Pod.
This commit is contained in:
parent
ca23b07dd4
commit
1b710a4c56
@ -99,6 +99,11 @@ func CreateStaticPodFiles(manifestDir, kustomizeDir string, cfg *kubeadmapi.Clus
|
||||
return errors.Errorf("couldn't retrieve StaticPodSpec for %q", componentName)
|
||||
}
|
||||
|
||||
// print all volumes that are mounted
|
||||
for _, v := range spec.Spec.Volumes {
|
||||
klog.V(2).Infof("[control-plane] adding volume %q for component %q", v.Name, componentName)
|
||||
}
|
||||
|
||||
// if kustomizeDir is defined, customize the static pod manifest
|
||||
if kustomizeDir != "" {
|
||||
kustomizedSpec, err := staticpodutil.KustomizeStaticPod(&spec, kustomizeDir)
|
||||
|
@ -144,7 +144,6 @@ func (c *controlPlaneHostPathMounts) AddHostPathMounts(component string, vols []
|
||||
// paths in the case that a user specifies the same volume/volume mount name.
|
||||
func (c *controlPlaneHostPathMounts) AddExtraHostPathMounts(component string, extraVols []kubeadmapi.HostPathMount) {
|
||||
for _, extraVol := range extraVols {
|
||||
fmt.Printf("[control-plane] Adding extra host path mount %q to %q\n", extraVol.Name, component)
|
||||
hostPathType := extraVol.PathType
|
||||
c.NewHostPathMount(component, extraVol.Name, extraVol.HostPath, extraVol.MountPath, extraVol.ReadOnly, &hostPathType)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user