Skip to content

Commit 813b050

Browse files
Merge pull request #18 from cobaltcore-dev/remove-logs-for-debug
Remove logs that were for debug
2 parents b8fc518 + e135e7c commit 813b050

2 files changed

Lines changed: 15 additions & 160 deletions

File tree

cloudprofilesync/imageupdater.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ import (
1616

1717
func filterImages(log logr.Logger, versions []SourceImage) []SourceImage {
1818
filtered := make([]SourceImage, 0, len(versions))
19-
log.Info("starting to filter source images", "total_versions", len(versions))
2019
for _, version := range versions {
21-
parsed, err := semver.Parse(version.Version)
20+
_, err := semver.Parse(version.Version)
2221
if err != nil {
2322
log.V(1).Info("skipping invalid version", "version", version.Version)
2423
continue
@@ -27,10 +26,8 @@ func filterImages(log logr.Logger, versions []SourceImage) []SourceImage {
2726
log.V(1).Info("skipping version with no architectures", "version", version.Version)
2827
continue
2928
}
30-
log.V(1).Info("valid version found", "version", version.Version, "major", parsed.Major, "minor", parsed.Minor, "patch", parsed.Patch, "pre_release", parsed.Pre)
3129
filtered = append(filtered, version)
3230
}
33-
log.Info("finished filtering source images", "valid_versions", len(filtered))
3431
return filtered
3532
}
3633

@@ -42,45 +39,33 @@ type ImageUpdater struct {
4239
}
4340

4441
func (iu *ImageUpdater) Update(ctx context.Context, cpSpec *gardenerv1beta1.CloudProfileSpec) error {
45-
iu.Log.Info("checking source", "image", iu.ImageName)
4642
sourceImages, err := iu.Source.GetVersions(ctx)
4743
if err != nil {
48-
iu.Log.Error(err, "failed to retrieve image versions from OCI registry", "image", iu.ImageName, "error_msg", err.Error())
4944
return fmt.Errorf("failed to retrieve image versions from OCI registry: %w", err)
5045
}
51-
iu.Log.Info("retrieved source images", "count", len(sourceImages), "image", iu.ImageName)
5246
sourceImages = filterImages(iu.Log, sourceImages)
5347
// Images from a source arrive in no guaranteed order. A changed order
5448
// in the source images may lead to a changed order in the CloudProfile,
5549
// causing unnecesscary reconciliations.
56-
iu.Log.Info("filtered valid images", "count", len(sourceImages), "image", iu.ImageName)
57-
for _, img := range sourceImages {
58-
iu.Log.V(1).Info("valid source image", "version", img.Version, "architectures", img.Architectures)
59-
}
6050
slices.SortFunc(sourceImages, func(a, b SourceImage) int {
6151
return cmp.Compare(a.Version, b.Version)
6252
})
63-
iu.Log.V(1).Info("sorted source images", "image", iu.ImageName)
6453
imageIndex := slices.IndexFunc(cpSpec.MachineImages, func(img gardenerv1beta1.MachineImage) bool {
6554
return img.Name == iu.ImageName
6655
})
6756
if imageIndex == -1 {
6857
cpSpec.MachineImages = append(cpSpec.MachineImages, gardenerv1beta1.MachineImage{Name: iu.ImageName})
6958
imageIndex = len(cpSpec.MachineImages) - 1
70-
iu.Log.Info("created new MachineImage entry", "image", iu.ImageName)
7159
}
7260
image := &cpSpec.MachineImages[imageIndex]
7361
existingVersions := make(map[string]int, len(image.Versions))
7462
for idx, version := range image.Versions {
7563
existingVersions[version.Version] = idx
7664
}
77-
iu.Log.V(1).Info("existing versions in CloudProfile", "count", len(existingVersions), "image", iu.ImageName)
7865
for _, sourceImage := range sourceImages {
7966
if idx, exists := existingVersions[sourceImage.Version]; exists {
80-
iu.Log.V(1).Info("updating existing version architectures", "version", sourceImage.Version, "architectures", sourceImage.Architectures)
8167
image.Versions[idx].Architectures = sourceImage.Architectures
8268
} else {
83-
iu.Log.Info("adding new version to CloudProfile", "version", sourceImage.Version, "architectures", sourceImage.Architectures)
8469
image.Versions = append(image.Versions, gardenerv1beta1.MachineImageVersion{
8570
ExpirableVersion: gardenerv1beta1.ExpirableVersion{
8671
Version: sourceImage.Version,
@@ -90,13 +75,9 @@ func (iu *ImageUpdater) Update(ctx context.Context, cpSpec *gardenerv1beta1.Clou
9075
}
9176
}
9277
if iu.Provider != nil {
93-
iu.Log.Info("invoking provider Configure", "image", iu.ImageName, "versions_count", len(sourceImages))
9478
if err := iu.Provider.Configure(cpSpec, sourceImages); err != nil {
95-
iu.Log.Error(err, "provider Configure failed", "image", iu.ImageName, "error_msg", err.Error())
9679
return fmt.Errorf("failed to invoke provider: %w", err)
9780
}
98-
iu.Log.Info("provider Configure succeeded", "image", iu.ImageName)
9981
}
100-
iu.Log.Info("finished updating CloudProfile for image", "image", iu.ImageName, "total_versions", len(image.Versions))
10182
return nil
10283
}

0 commit comments

Comments
 (0)