Skip to content
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

Jump to bottom

fix multiple configmap and secret keys mount #18 #20

Merged
merged 1 commit into from
Aug 26, 2024
Merged

fix multiple configmap and secret keys mount #18 #20

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
88 changes: 46 additions & 42 deletions pkg/slurm/aux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,15 @@ func prepareMounts(

log.G(Ctx).Debug(configMapPath)

if os.Getenv("SHARED_FS") != "true" {
dirs := strings.Split(configMapPath, ":")
splitDirs := strings.Split(dirs[0], "/")
dir := filepath.Join(splitDirs[:len(splitDirs)-1]...)
prefix += "\nmkdir -p " + dir + " && touch " + dirs[0] + " && echo $" + env + " > " + dirs[0]
for _, cfgMapPath := range configMapPath {
if os.Getenv("SHARED_FS") != "true" {
dirs := strings.Split(cfgMapPath, ":")
splitDirs := strings.Split(dirs[0], "/")
dir := filepath.Join(splitDirs[:len(splitDirs)-1]...)
prefix += "\nmkdir -p " + dir + " && touch " + dirs[0] + " && echo $" + env + " > " + dirs[0]
}
mountedData += " --bind " + cfgMapPath
}
mountedData += "--bind " + configMapPath

}
}

Expand All @@ -263,16 +264,17 @@ func prepareMounts(

log.G(Ctx).Debug(secretPath)

if os.Getenv("SHARED_FS") != "true" {
dirs := strings.Split(secretPath, ":")
splitDirs := strings.Split(dirs[0], "/")
dir := filepath.Join(splitDirs[:len(splitDirs)-1]...)
splittedEnv := strings.Split(env, "_")
log.G(Ctx).Info(splittedEnv[len(splittedEnv)-1])
prefix += "\nmkdir -p " + dir + " && touch " + dirs[0] + " && echo $" + env + " > " + dirs[0]
for _, scrtPath := range secretPath {
if os.Getenv("SHARED_FS") != "true" {
dirs := strings.Split(scrtPath, ":")
splitDirs := strings.Split(dirs[0], "/")
dir := filepath.Join(splitDirs[:len(splitDirs)-1]...)
splittedEnv := strings.Split(env, "_")
log.G(Ctx).Info(splittedEnv[len(splittedEnv)-1])
prefix += "\nmkdir -p " + dir + " && touch " + dirs[0] + " && echo $" + env + " > " + dirs[0]
}
mountedData += " --bind " + scrtPath
}
mountedData += "--bind " + secretPath

}
}

Expand All @@ -285,15 +287,17 @@ func prepareMounts(

log.G(Ctx).Debug(edPath)

mountedData += edPath
for _, mntData := range edPath {
mountedData += mntData
}
}

}

mountedData += "--bind " + config.DataRootFolder + podData.Pod.Namespace + "-" + string(podData.Pod.UID) + "/" + "command_" + container.Name + ".sh" +
":" + "/tmp/" + "command_" + container.Name + ".sh "
mountedData += "--bind " + config.DataRootFolder + podData.Pod.Namespace + "-" + string(podData.Pod.UID) + "/" + "args_" + container.Name + ".sh" +
":" + "/tmp/" + "args_" + container.Name + ".sh"
mountedData += "--bind " + config.DataRootFolder + podData.Pod.Namespace + "-" + string(podData.Pod.UID) + "/" + "command_" + container.Name + ".sh" +
":" + "/tmp/" + "command_" + container.Name + ".sh "
mountedData += "--bind " + config.DataRootFolder + podData.Pod.Namespace + "-" + string(podData.Pod.UID) + "/" + "args_" + container.Name + ".sh" +
":" + "/tmp/" + "args_" + container.Name + ".sh"

if last := len(mountedData) - 1; last >= 0 && mountedData[last] == ',' {
mountedData = mountedData[:last]
Expand Down Expand Up @@ -604,21 +608,21 @@ func deleteContainer(Ctx context.Context, config SlurmConfig, podUID string, JID
// Returns 2 slices of string, one containing the ConfigMaps/Secrets/EmptyDirs paths and one the list of relatives ENVS to be used
// to create the files inside the container.
// It also returns the first encountered error.
func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1.Container, data interface{}, path string) (string, string, error) {
func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1.Container, data interface{}, path string) ([]string, string, error) {
if config.ExportPodData {
for _, mountSpec := range container.VolumeMounts {
switch mount := data.(type) {
case v1.ConfigMap:
for _, vol := range pod.Spec.Volumes {
if vol.ConfigMap != nil && vol.Name == mountSpec.Name && mount.Name == vol.ConfigMap.Name {
configMaps := make(map[string]string)
var configMapNamePath string
var configMapNamePath []string
var env string

err := os.RemoveAll(path + "/configMaps/" + mount.Name)
if err != nil {
log.G(Ctx).Error("Unable to delete root folder")
return "", "", err
return []string{}, "", err
}

//if podVolumeSpec != nil && podVolumeSpec.ConfigMap != nil {
Expand All @@ -638,15 +642,15 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1
mode = ":rw"
}
fullPath += (":" + mountSpec.MountPath + "/" + key + mode + " ")
configMapNamePath = fullPath
configMapNamePath = append(configMapNamePath, fullPath)

if os.Getenv("SHARED_FS") != "true" {
envTemp := string(container.Name) + "_CFG_" + string(hexString)
log.G(Ctx).Debug("---- Setting env " + env + " to mount the file later")
err = os.Setenv(env, mount.Data[key])
if err != nil {
log.G(Ctx).Error("Unable to set ENV for cfgmap " + key)
return "", "", err
return []string{}, "", err
}
env = envTemp
}
Expand All @@ -665,10 +669,10 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1

if err != nil {
log.G(Ctx).Error(err)
return "", "", err
return []string{}, "", err
} else if execReturn.Stderr != "" {
log.G(Ctx).Error(execReturn.Stderr)
return "", "", errors.New(execReturn.Stderr)
return []string{}, "", errors.New(execReturn.Stderr)
} else {
log.G(Ctx).Debug("--- Created folder " + podConfigMapDir)
}
Expand All @@ -683,9 +687,9 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1
os.RemoveAll(fullPath)
if err != nil {
log.G(Ctx).Error("Unable to remove file " + fullPath)
return "", "", err
return []string{}, "", err
}
return "", "", err
return []string{}, "", err
} else {
log.G(Ctx).Debug("Written ConfigMap file " + fullPath)
}
Expand All @@ -700,14 +704,14 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1
for _, vol := range pod.Spec.Volumes {
if vol.Secret != nil && vol.Name == mountSpec.Name && mount.Name == vol.Secret.SecretName {
secrets := make(map[string][]byte)
var secretNamePath string
var secretNamePath []string
var env string

err := os.RemoveAll(path + "/secrets/" + mountSpec.Name)

if err != nil {
log.G(Ctx).Error("Unable to delete root folder")
return "", "", err
return []string{}, "", err
}

//if podVolumeSpec != nil && podVolumeSpec.Secret != nil {
Expand All @@ -727,15 +731,15 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1
mode = ":rw"
}
fullPath += (":" + mountSpec.MountPath + "/" + key + mode + " ")
secretNamePath = fullPath
secretNamePath = append(secretNamePath, fullPath)

if os.Getenv("SHARED_FS") != "true" {
envTemp := string(container.Name) + "_SECRET_" + hexString
log.G(Ctx).Debug("---- Setting env " + env + " to mount the file later")
err = os.Setenv(env, string(mount.Data[key]))
if err != nil {
log.G(Ctx).Error("Unable to set ENV for secret " + key)
return "", "", err
return []string{}, "", err
}
env = envTemp
}
Expand All @@ -754,11 +758,11 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1
execReturn, err := shell.Execute()
if strings.Compare(execReturn.Stdout, "") != 0 {
log.G(Ctx).Error(err)
return "", "", err
return []string{}, "", err
}
if execReturn.Stderr != "" {
log.G(Ctx).Error(execReturn.Stderr)
return "", "", errors.New(execReturn.Stderr)
return []string{}, "", err
} else {
log.G(Ctx).Debug("--- Created folder " + podSecretDir)
}
Expand All @@ -773,9 +777,9 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1
err = os.RemoveAll(fullPath)
if err != nil {
log.G(Ctx).Error("Unable to remove file " + fullPath)
return "", "", err
return []string{}, "", err
}
return "", "", err
return []string{}, "", err
} else {
log.G(Ctx).Debug("--- Written Secret file " + fullPath)
}
Expand All @@ -787,7 +791,7 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1
//}

case string:
var edPaths string
var edPaths []string
for _, vol := range pod.Spec.Volumes {
for _, mountSpec := range container.VolumeMounts {
if vol.EmptyDir != nil && vol.Name == mountSpec.Name {
Expand All @@ -804,7 +808,7 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1
_, err := shell.Execute()
if err != nil {
log.G(Ctx).Error(err)
return "", "", err
return []string{}, "", err
} else {
log.G(Ctx).Debug("-- Created EmptyDir in " + edPath)
}
Expand All @@ -816,15 +820,15 @@ func mountData(Ctx context.Context, config SlurmConfig, pod v1.Pod, container v1
mode = ":rw"
}
edPath += (":" + mountSpec.MountPath + mode + " ")
edPaths += "--bind " + edPath + " "
edPaths = append(edPaths, " --bind "+edPath+" ")
}
}
}
return edPaths, "", nil
}
}
}
return "", "", nil
return []string{}, "", nil
}

// checkIfJidExists checks if a JID is in the main JIDs struct
Expand Down