Skip to content

Commit

Permalink
Fix #372 added flag DisableProjectedVolumes + fix timeout loop creati…
Browse files Browse the repository at this point in the history 
…on (#374)
  • Loading branch information
@dciangot
dciangot authored Feb 4, 2025
2 parents 60ce516 + ac2642f commit 282fe60
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 26 deletions.
37 changes: 19 additions & 18 deletions pkg/virtualkubelet/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@ package virtualkubelet

// Config holds the whole configuration
type Config struct {
InterlinkURL string `yaml:"InterlinkURL"`
Interlinkport string `yaml:"InterlinkPort"`
KubernetesAPIAddr string `yaml:"KubernetesApiAddr"`
KubernetesAPIPort string `yaml:"KubernetesApiPort"`
KubernetesAPICaCrt string `yaml:"KubernetesApiCaCrt"`
VKConfigPath string `yaml:"VKConfigPath"`
VKTokenFile string `yaml:"VKTokenFile"`
ServiceAccount string `yaml:"ServiceAccount"`
Namespace string `yaml:"Namespace"`
PodIP string `yaml:"PodIP"`
VerboseLogging bool `yaml:"VerboseLogging"`
ErrorsOnlyLogging bool `yaml:"ErrorsOnlyLogging"`
HTTP HTTP `yaml:"HTTP"`
KubeletHTTP HTTP `yaml:"KubeletHTTP"`
CPU string `yaml:"CPU,omitempty"`
Memory string `yaml:"Memory,omitempty"`
Pods string `yaml:"Pods,omitempty"`
GPU string `yaml:"nvidia.com/gpu,omitempty"`
InterlinkURL string `yaml:"InterlinkURL"`
Interlinkport string `yaml:"InterlinkPort"`
KubernetesAPIAddr string `yaml:"KubernetesApiAddr"`
KubernetesAPIPort string `yaml:"KubernetesApiPort"`
KubernetesAPICaCrt string `yaml:"KubernetesApiCaCrt"`
DisableProjectedVolumes bool `yaml:"DisableProjectedVolumes"`
VKConfigPath string `yaml:"VKConfigPath"`
VKTokenFile string `yaml:"VKTokenFile"`
ServiceAccount string `yaml:"ServiceAccount"`
Namespace string `yaml:"Namespace"`
PodIP string `yaml:"PodIP"`
VerboseLogging bool `yaml:"VerboseLogging"`
ErrorsOnlyLogging bool `yaml:"ErrorsOnlyLogging"`
HTTP HTTP `yaml:"HTTP"`
KubeletHTTP HTTP `yaml:"KubeletHTTP"`
CPU string `yaml:"CPU,omitempty"`
Memory string `yaml:"Memory,omitempty"`
Pods string `yaml:"Pods,omitempty"`
GPU string `yaml:"nvidia.com/gpu,omitempty"`
}

type HTTP struct {
Expand Down
23 changes: 15 additions & 8 deletions pkg/virtualkubelet/execute.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import (
const PodPhaseInitialize = "Initializing"
const PodPhaseCompleted = "Completed"

func failedMount(ctx context.Context, failedAndWait *bool, name string, pod *v1.Pod, p *Provider) error {
func failedMount(ctx context.Context, failedAndWait *bool, name string, pod *v1.Pod, p *Provider, err error) error {
*failedAndWait = true
log.G(ctx).Warning("Unable to find ConfigMap " + name + " for pod " + pod.Name + ". Waiting for it to be initialized")
log.G(ctx).Warningf("Unable to find ConfigMap %s for pod %s. Waiting for it to be initialized. Error was: %v. Current phase: %s", name, pod.Name, err, pod.Status.Phase)
if pod.Status.Phase != PodPhaseInitialize {
pod.Status.Phase = PodPhaseInitialize
err := p.UpdatePod(ctx, pod)
Expand Down Expand Up @@ -609,8 +609,8 @@ func remoteExecutionHandleProjectedSource(

func remoteExecutionHandleVolumes(ctx context.Context, p *Provider, pod *v1.Pod, req *types.PodCreateRequests) error {
startTime := time.Now()
endTime := startTime.Add(5 * time.Minute)

timeNow := time.Now()
_, err := p.clientSet.CoreV1().Pods(pod.Namespace).Get(ctx, pod.Name, metav1.GetOptions{})
if err != nil {
log.G(ctx).Warning("Deleted Pod before actual creation")
Expand All @@ -625,12 +625,12 @@ func remoteExecutionHandleVolumes(ctx context.Context, p *Provider, pod *v1.Pod,
log.G(ctx).Debug("Looking at volume ", volume)
for {
failedAndWait = false
if timeNow.Sub(startTime).Seconds() < time.Hour.Minutes()*5 {
if time.Now().Before(endTime) {
switch {
case volume.ConfigMap != nil:
cfgmap, err := p.clientSet.CoreV1().ConfigMaps(pod.Namespace).Get(ctx, volume.ConfigMap.Name, metav1.GetOptions{})
if err != nil {
err = failedMount(ctx, &failedAndWait, volume.ConfigMap.Name, pod, p)
err = failedMount(ctx, &failedAndWait, volume.ConfigMap.Name, pod, p, err)
if err != nil {
return err
}
Expand All @@ -641,6 +641,12 @@ func remoteExecutionHandleVolumes(ctx context.Context, p *Provider, pod *v1.Pod,
case volume.Projected != nil:
// The service account token uses the projected volume in K8S >= 1.24.

if p.config.DisableProjectedVolumes {
// This flag disable doing anything about Projected Volumes.
log.G(ctx).Warning("Flag DisableProjectedVolumes set to true, so not handing Projected Volume: ", volume)
break
}

var projectedVolume v1.ConfigMap
projectedVolume.Name = volume.Name
projectedVolume.Data = make(map[string]string)
Expand All @@ -659,7 +665,7 @@ func remoteExecutionHandleVolumes(ctx context.Context, p *Provider, pod *v1.Pod,
case volume.Secret != nil:
scrt, err := p.clientSet.CoreV1().Secrets(pod.Namespace).Get(ctx, volume.Secret.SecretName, metav1.GetOptions{})
if err != nil {
err = failedMount(ctx, &failedAndWait, volume.Secret.SecretName, pod, p)
err = failedMount(ctx, &failedAndWait, volume.Secret.SecretName, pod, p, err)
if err != nil {
return err
}
Expand All @@ -675,7 +681,8 @@ func remoteExecutionHandleVolumes(ctx context.Context, p *Provider, pod *v1.Pod,
}

if failedAndWait {
time.Sleep(time.Second)
log.G(ctx).Warningf("volume %s not ready, sleeping 2s, attempt %f / 5 minutes max", volume.Name, time.Since(startTime).Minutes())
time.Sleep(2 * time.Second)
continue
}
pod.Status.Phase = v1.PodPending
Expand All @@ -695,7 +702,7 @@ func remoteExecutionHandleVolumes(ctx context.Context, p *Provider, pod *v1.Pod,
if err != nil {
return err
}
return errors.New("unable to retrieve ConfigMaps or Secrets. Check logs")
return errors.New("unable to retrieve ConfigMaps or Secrets after 5m. Check logs")
}
}
return nil
Expand Down

0 comments on commit 282fe60

Please sign in to comment.