Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions pkg/provision/workspace/pull_secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package workspace
import (
"context"
"fmt"
"time"

"github.com/devfile/devworkspace-operator/pkg/provision/sync"
"k8s.io/apimachinery/pkg/types"
Expand All @@ -30,6 +31,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

const (
pullSecretCreationTimeout time.Duration = 5_000_000_000 // 5 seconds
)

type PullSecretsProvisioningStatus struct {
ProvisioningStatus
v1alpha1.PodAdditions
Expand Down Expand Up @@ -70,6 +75,15 @@ func PullSecrets(clusterAPI sync.ClusterAPI, serviceAccountName, namespace strin
}
}

if len(serviceAccount.ImagePullSecrets) == 0 && serviceAccount.CreationTimestamp.Add(pullSecretCreationTimeout).After(time.Now()) {
return PullSecretsProvisioningStatus{
ProvisioningStatus: ProvisioningStatus{
Requeue: true,
Message: "Waiting for image pull secrets",
},
}
}

dockerCfgs := serviceAccount.ImagePullSecrets
for _, s := range secrets.Items {
if s.Type == corev1.SecretTypeDockercfg || s.Type == corev1.SecretTypeDockerConfigJson {
Expand Down