Skip to content

Commit 2ef0cb3

Browse files
yevgeny-shnaidmank8s-ci-robot
authored andcommitted
Fixing image repo secret extraction for unloading worker pod
image repo secret wasd previously extracted from the volume that was mapped into the loading pod. Since the volume no longer exists, we must extract it from the imagePullSecret of the loading pod
1 parent 67241e4 commit 2ef0cb3

File tree

2 files changed

+5
-36
lines changed

2 files changed

+5
-36
lines changed

internal/controllers/nmc_reconciler.go

+4-28
Original file line numberDiff line numberDiff line change
@@ -538,16 +538,9 @@ func (h *nmcReconcilerHelperImpl) SyncStatus(ctx context.Context, nmcObj *kmmv1b
538538
continue
539539
}
540540

541-
if irsName, err := getImageRepoSecretName(&p); err != nil {
542-
logger.Info(
543-
utils.WarnString("Error while looking for the imageRepoSecret volume"),
544-
"error",
545-
err,
546-
)
547-
} else if irsName != "" {
548-
status.ImageRepoSecret = &v1.LocalObjectReference{Name: irsName}
541+
if p.Spec.ImagePullSecrets != nil {
542+
status.ImageRepoSecret = &p.Spec.ImagePullSecrets[0]
549543
}
550-
551544
status.ServiceAccountName = p.Spec.ServiceAccountName
552545

553546
podLTT := GetContainerStatus(p.Status.ContainerStatuses, workerContainerName).
@@ -729,9 +722,8 @@ const (
729722
configFileName = "config.yaml"
730723
configFullPath = volMountPointConfig + "/" + configFileName
731724

732-
volNameConfig = "config"
733-
volNameImageRepoSecret = "image-repo-secret"
734-
volMountPointConfig = "/etc/kmm-worker"
725+
volNameConfig = "config"
726+
volMountPointConfig = "/etc/kmm-worker"
735727
)
736728

737729
//go:generate mockgen -source=nmc_reconciler.go -package=controllers -destination=mock_nmc_reconciler.go podManager
@@ -1235,22 +1227,6 @@ func setHashAnnotation(pod *v1.Pod) error {
12351227
return nil
12361228
}
12371229

1238-
func getImageRepoSecretName(pod *v1.Pod) (string, error) {
1239-
for _, v := range pod.Spec.Volumes {
1240-
if v.Name == volNameImageRepoSecret {
1241-
svs := v.VolumeSource.Secret
1242-
1243-
if svs == nil {
1244-
return "", fmt.Errorf("volume %s is not of type secret", volNameImageRepoSecret)
1245-
}
1246-
1247-
return svs.SecretName, nil
1248-
}
1249-
}
1250-
1251-
return "", nil
1252-
}
1253-
12541230
func getModulesOrderAnnotationValue(modulesNames []string) string {
12551231
var softDepData strings.Builder
12561232
for i := 0; i < len(modulesNames)-1; i++ {

internal/controllers/nmc_reconciler_test.go

+1-8
Original file line numberDiff line numberDiff line change
@@ -1047,14 +1047,7 @@ var _ = Describe("nmcReconcilerHelperImpl_SyncStatus", func() {
10471047
},
10481048
Spec: v1.PodSpec{
10491049
ServiceAccountName: serviceAccountName,
1050-
Volumes: []v1.Volume{
1051-
{
1052-
Name: volNameImageRepoSecret,
1053-
VolumeSource: v1.VolumeSource{
1054-
Secret: &v1.SecretVolumeSource{SecretName: irsName},
1055-
},
1056-
},
1057-
},
1050+
ImagePullSecrets: []v1.LocalObjectReference{v1.LocalObjectReference{Name: irsName}},
10581051
},
10591052
Status: v1.PodStatus{
10601053
Phase: v1.PodSucceeded,

0 commit comments

Comments
 (0)