Skip to content

Commit

Permalink
Merge pull request #1666 from AhmedGrati/fix-missing-image-pull-secrets
Browse files Browse the repository at this point in the history
fix missing image pull secrets
  • Loading branch information
k8s-ci-robot committed Jul 16, 2023
2 parents e121826 + 7255eb5 commit 008422c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
22 changes: 22 additions & 0 deletions pkg/transformer/kubernetes/kubernetes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1072,3 +1072,25 @@ func TestNetworkPoliciesGeneration(t *testing.T) {
}
}
}

func TestServiceGroupModeImagePullSecrets(t *testing.T) {
groupName := "pod_group"
serviceConfig := newServiceConfig()
komposeObject := kobject.KomposeObject{
ServiceConfigs: map[string]kobject.ServiceConfig{"app": serviceConfig},
}
k := Kubernetes{}
objs, err := k.Transform(komposeObject, kobject.ConvertOptions{ServiceGroupMode: groupName, GenerateNetworkPolicies: true})
if err != nil {
t.Error(errors.Wrap(err, "k.Transform failed"))
}
expectedSecretsLen := len(serviceConfig.ImagePullSecret)
for _, obj := range objs {
if deployment, ok := obj.(*appsv1.Deployment); ok {
secretsLen := len(deployment.Spec.Template.Spec.ImagePullSecrets)
if secretsLen != expectedSecretsLen {
t.Errorf("Expected length of Deployment ImagePullSecrets to be equal to %v, got %v", expectedSecretsLen, secretsLen)
}
}
}
}
6 changes: 5 additions & 1 deletion pkg/transformer/kubernetes/podspec.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ func AddContainer(service kobject.ServiceConfig, opt kobject.ConvertOptions) Pod
LivenessProbe: configProbe(service.HealthChecks.Liveness),
ReadinessProbe: configProbe(service.HealthChecks.Readiness),
})

if service.ImagePullSecret != "" {
podSpec.ImagePullSecrets = append(podSpec.ImagePullSecrets, api.LocalObjectReference{
Name: service.ImagePullSecret,
})
}
podSpec.Affinity = ConfigAffinity(service)
}
}
Expand Down

0 comments on commit 008422c

Please sign in to comment.