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 some code and add UTs #28

Merged
merged 6 commits into from
Dec 7, 2023
Merged

Fix some code and add UTs #28

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a075bf7
Make launcher test code more efficient
ShellyKa13 Nov 28, 2023
adbfd43
Change formatResults function to recieve results and not status
ShellyKa13 Nov 30, 2023
63fd5e4
Handle unsupported provisioner also in vscs checkup
ShellyKa13 Nov 30, 2023
8f6360c
Handle golden images errors the same way
ShellyKa13 Nov 30, 2023
a35cb28
Add and adjust UT
ShellyKa13 Nov 30, 2023
fc3a662
Lint fixes
ShellyKa13 Dec 3, 2023
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
48 changes: 25 additions & 23 deletions pkg/internal/checkup/checkup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,17 @@ const (

AnnDefaultStorageClass = "storageclass.kubernetes.io/is-default-class"

errNoDefaultStorageClass = "No default storage class."
errMultipleDefaultStorageClasses = "There are multiple default storage classes."
errEmptyClaimPropertySets = "There are StorageProfiles with empty ClaimPropertySets (unknown provisioners)."
errMissingVolumeSnapshotClass = "There are StorageProfiles missing VolumeSnapshotClass."
errVMsWithNonVirtRbdStorageClass = "There are VMs using the plain RBD storageclass when the virtualization storageclass exists."
errVMsWithUnsetEfsStorageClass = "There are VMs using an EFS storageclass where the gid and uid are not set in the storageclass."
errGoldenImagesNotUpToDate = "There are golden images whose DataImportCron is not up to date or DataSource is not ready."
messageSkipNoGoldenImage = "Skip check - no golden image PVC or Snapshot"
messageSkipNoVMI = "Skip check - no VMI"
ErrNoDefaultStorageClass = "No default storage class."
ErrMultipleDefaultStorageClasses = "There are multiple default storage classes."
ErrEmptyClaimPropertySets = "There are StorageProfiles with empty ClaimPropertySets (unknown provisioners)."
// FIXME: need to decide of we want to return errors in this cases
// errMissingVolumeSnapshotClass = "There are StorageProfiles missing VolumeSnapshotClass."
// errVMsWithNonVirtRbdStorageClass = "There are VMs using the plain RBD storageclass when the virtualization storageclass exists."
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaiu, we shoud report these cases in the status but not fail the checkup

ErrVMsWithUnsetEfsStorageClass = "There are VMs using an EFS storageclass where the gid and uid are not set in the storageclass."
ErrGoldenImagesNotUpToDate = "There are golden images whose DataImportCron is not up to date or DataSource is not ready."
ErrGoldenImageNoDataSource = "DataSource has no PVC or Snapshot source"
MessageSkipNoGoldenImage = "Skip check - no golden image PVC or Snapshot"
MessageSkipNoVMI = "Skip check - no VMI"

pollInterval = 5 * time.Second
pollDuration = 3 * time.Minute
Expand Down Expand Up @@ -209,7 +211,7 @@ func (c *Checkup) checkGoldenImages(ctx context.Context, namespaces *corev1.Name

if cs.notReadyDicNames != "" {
c.results.GoldenImagesNotUpToDate = cs.notReadyDicNames
appendSep(errStr, errGoldenImagesNotUpToDate)
appendSep(errStr, ErrGoldenImagesNotUpToDate)
}
if cs.noDataSourceDicNames != "" {
c.results.GoldenImagesNoDataSource = cs.noDataSourceDicNames
Expand Down Expand Up @@ -272,7 +274,7 @@ func (c *Checkup) getGoldenImage(ctx context.Context, dic *cdiv1.DataImportCron)
return nil, snap, nil
}

return nil, nil, errors.New("DataSource has no PVC or Snapshot source")
return nil, nil, errors.New(ErrGoldenImageNoDataSource)
}

func isDataImportCronUpToDate(conditions []cdiv1.DataImportCronCondition) bool {
Expand Down Expand Up @@ -330,16 +332,16 @@ func (c *Checkup) checkDefaultStorageClass(scs *storagev1.StorageClassList, errS
sc := scs.Items[i]
if sc.Annotations[AnnDefaultStorageClass] == "true" {
if c.results.DefaultStorageClass != "" {
c.results.DefaultStorageClass = errMultipleDefaultStorageClasses
appendSep(errStr, errMultipleDefaultStorageClasses)
c.results.DefaultStorageClass = ErrMultipleDefaultStorageClasses
appendSep(errStr, ErrMultipleDefaultStorageClasses)
break
}
c.results.DefaultStorageClass = sc.Name
}
}
if c.results.DefaultStorageClass == "" {
c.results.DefaultStorageClass = errNoDefaultStorageClass
appendSep(errStr, errNoDefaultStorageClass)
c.results.DefaultStorageClass = ErrNoDefaultStorageClass
appendSep(errStr, ErrNoDefaultStorageClass)
}
}

Expand Down Expand Up @@ -399,7 +401,7 @@ func (c *Checkup) checkStorageProfiles(ctx context.Context, sps *cdiv1.StoragePr

if spWithEmptyClaimPropertySets != "" {
c.results.StorageProfilesWithEmptyClaimPropertySets = spWithEmptyClaimPropertySets
appendSep(errStr, errEmptyClaimPropertySets)
appendSep(errStr, ErrEmptyClaimPropertySets)
}
if spWithSpecClaimPropertySets != "" {
c.results.StorageProfilesWithSpecClaimPropertySets = spWithSpecClaimPropertySets
Expand Down Expand Up @@ -506,7 +508,7 @@ func (c *Checkup) checkVMIs(ctx context.Context, namespaces *corev1.NamespaceLis
}
if vmisWithUnsetEfsSC != "" {
c.results.VMsWithUnsetEfsStorageClass = vmisWithUnsetEfsSC
appendSep(errStr, errVMsWithUnsetEfsStorageClass)
appendSep(errStr, ErrVMsWithUnsetEfsStorageClass)
}

return nil
Expand Down Expand Up @@ -647,8 +649,8 @@ func (c *Checkup) checkVMICreation(ctx context.Context, errStr *string) error {

log.Print("checkVMICreation")
if c.goldenImagePvc == nil && c.goldenImageSnap == nil {
log.Print(messageSkipNoGoldenImage)
c.results.VMBootFromGoldenImage = messageSkipNoGoldenImage
log.Print(MessageSkipNoGoldenImage)
c.results.VMBootFromGoldenImage = MessageSkipNoGoldenImage
return nil
}

Expand Down Expand Up @@ -695,8 +697,8 @@ func (c *Checkup) checkVMILiveMigration(ctx context.Context, errStr *string) err
log.Print("checkVMILiveMigration")

if c.vmUnderTest == nil {
log.Print(messageSkipNoVMI)
c.results.VMLiveMigration = messageSkipNoVMI
log.Print(MessageSkipNoVMI)
c.results.VMLiveMigration = MessageSkipNoVMI
return nil
}

Expand Down Expand Up @@ -752,8 +754,8 @@ func (c *Checkup) checkVMIHotplugVolume(ctx context.Context, errStr *string) err
log.Print("checkVMIHotplugVolume")

if c.vmUnderTest == nil {
log.Print(messageSkipNoVMI)
c.results.VMHotplugVolume = messageSkipNoVMI
log.Print(MessageSkipNoVMI)
c.results.VMHotplugVolume = MessageSkipNoVMI
return nil
}

Expand Down
Loading