Add latest discriminator in status

Signed-off-by: GregoireW <[email protected]>

Author: GregoireW

api/v1beta2/imagepolicy_types.go

@@ -113,8 +113,13 @@ type ImagePolicyStatus struct {
 	// the image repository, when filtered and ordered according to
 	// the policy.
 	LatestImage string `json:"latestImage,omitempty"`
+	// Distribution of tags scanned by the image repository
 	// +optional
 	Distribution map[string]ImageAndAttributes `json:"distribution,omitempty"`
+	// Discriminator of the latest image.
+	// +optional
+	LatestDiscriminator string  `json:"latestDiscriminator,omitempty"`
+	// len of the distribution map. Statistics only.
 	NbDistribution int `json:"nbDistribution,omitempty"`
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`

config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml

@@ -584,11 +584,16 @@ spec:
                   - image
                   - tag
                   type: object
+                description: Distribution of tags scanned by the image repository
                 type: object
+              latestDiscriminator:
+                description: Discriminator of the latest image.
+                type: string
               latestImage:
                 description: LatestImage gives the first in the list of images scanned by the image repository, when filtered and ordered according to the policy.
                 type: string
               nbDistribution:
+                description: len of the distribution map. Statistics only.
                 type: integer
               observedGeneration:
                 format: int64

controllers/imagepolicy_controller.go

@@ -176,6 +176,7 @@ func (r *ImagePolicyReconciler) nonDiscriminated(ctx context.Context, req ctrl.R
 
 	pol.Status.Distribution = nil
 	pol.Status.NbDistribution = 0
+	pol.Status.LatestDiscriminator = ""
 
 	if policer != nil {
 		var tags []string
@@ -249,6 +250,7 @@ func (r *ImagePolicyReconciler) nonDiscriminated(ctx context.Context, req ctrl.R
 func (r *ImagePolicyReconciler) discriminated(ctx context.Context, req ctrl.Request, policer policy.Policer, repo imagev1.ImageRepository, pol imagev1.ImagePolicy) (ctrl.Result, error) {
 	distribution := map[string]imagev1.ImageAndAttributes{}
 	latest := ""
+	latestDiscriminator := ""
 	var err error
 
 	listAttributes := []string{ pol.Spec.FilterTags.Discriminator, pol.Spec.FilterTags.Extract }
@@ -283,8 +285,8 @@ func (r *ImagePolicyReconciler) discriminated(ctx context.Context, req ctrl.Requ
 					newer, err := policer.Latest(extractedList)
 
 					if err == nil {
-						img := distribution[distribByExtracted[newer]]
-						latest = img.Tag
+						latestDiscriminator = distribByExtracted[newer]
+						latest = distribution[latestDiscriminator].Tag
 					}
 				}
 			}
@@ -330,6 +332,7 @@ func (r *ImagePolicyReconciler) discriminated(ctx context.Context, req ctrl.Requ
 	pol.Status.Distribution = distribution
 	pol.Status.NbDistribution = len(distribution)
 	pol.Status.LatestImage = repo.Spec.Image + ":" + latest
+	pol.Status.LatestDiscriminator = latestDiscriminator
 	imagev1.SetImagePolicyReadiness(
 		&pol,
 		metav1.ConditionTrue,