feat: add Scheduled and UnavailableSecret Image monitoring status

Author: plaffitt

api/kuik/v1alpha1/image_types.go

@@ -35,21 +35,23 @@ type ReferencesWithCount struct {
 type ImageStatusUpstream string
 
 const (
-	ImageStatusUpstreamAvailable     = ImageStatusUpstream("Available")
-	ImageStatusUpstreamUnavailable   = ImageStatusUpstream("Unavailable")
-	ImageStatusUpstreamUnreachable   = ImageStatusUpstream("Unreachable")
-	ImageStatusUpstreamInvalidAuth   = ImageStatusUpstream("InvalidAuth")
-	ImageStatusUpstreamQuotaExceeded = ImageStatusUpstream("QuotaExceeded")
-	ImageStatusUpstreamUnknown       = ImageStatusUpstream("")
+	ImageStatusUpstreamScheduled         = ImageStatusUpstream("Scheduled")
+	ImageStatusUpstreamAvailable         = ImageStatusUpstream("Available")
+	ImageStatusUpstreamUnavailable       = ImageStatusUpstream("Unavailable")
+	ImageStatusUpstreamUnreachable       = ImageStatusUpstream("Unreachable")
+	ImageStatusUpstreamInvalidAuth       = ImageStatusUpstream("InvalidAuth")
+	ImageStatusUpstreamUnavailableSecret = ImageStatusUpstream("UnavailableSecret")
+	ImageStatusUpstreamQuotaExceeded     = ImageStatusUpstream("QuotaExceeded")
 )
 
 var ImageStatusUpstreamList = []ImageStatusUpstream{
+	ImageStatusUpstreamScheduled,
 	ImageStatusUpstreamAvailable,
 	ImageStatusUpstreamUnavailable,
 	ImageStatusUpstreamUnreachable,
 	ImageStatusUpstreamInvalidAuth,
+	ImageStatusUpstreamUnavailableSecret,
 	ImageStatusUpstreamQuotaExceeded,
-	ImageStatusUpstreamUnknown,
 }
 
 type Upstream struct {
@@ -60,7 +62,8 @@ type Upstream struct {
 	// LastError is the last error encountered while trying to monitor the upstream image
 	LastError string `json:"lastError,omitempty"`
 	// Status is the status of the last finished monitoring task
-	// +kubebuilder:validation:Enum=Available;Unavailable;Unreachable;InvalidAuth;QuotaExceeded
+	// +kubebuilder:validation:Enum=Scheduled;Available;Unavailable;Unreachable;InvalidAuth;UnavailableSecret;QuotaExceeded
+	// +default="Scheduled"
 	Status ImageStatusUpstream `json:"status,omitempty"`
 	// Digest is the digest of the upstream image manifest, if available
 	Digest string `json:"digest,omitempty"`

config/crd/bases/kuik.enix.io_images.yaml

@@ -91,13 +91,16 @@ spec:
                     format: date-time
                     type: string
                   status:
+                    default: Scheduled
                     description: Status is the status of the last finished monitoring
                       task
                     enum:
+                    - Scheduled
                     - Available
                     - Unavailable
                     - Unreachable
                     - InvalidAuth
+                    - UnavailableSecret
                     - QuotaExceeded
                     type: string
                 type: object

helm/kube-image-keeper/crds/kuik.enix.io_images.yaml

@@ -90,13 +90,16 @@ spec:
                     format: date-time
                     type: string
                   status:
+                    default: Scheduled
                     description: Status is the status of the last finished monitoring
                       task
                     enum:
+                    - Scheduled
                     - Available
                     - Unavailable
                     - Unreachable
                     - InvalidAuth
+                    - UnavailableSecret
                     - QuotaExceeded
                     type: string
                 type: object

internal/controller/collector.go

@@ -138,7 +138,7 @@ func (m *kuikMetrics) addCollector(collector prometheus.Collector) {
 
 func (m *kuikMetrics) InitMonitoringTaskRegistry(registry string) {
 	for _, status := range kuikv1alpha1.ImageStatusUpstreamList {
-		if status != kuikv1alpha1.ImageStatusUpstreamUnknown {
+		if status != kuikv1alpha1.ImageStatusUpstreamScheduled {
 			m.monitoringTasks.WithLabelValues(registry, status.ToString()).Add(0)
 		}
 	}

internal/controller/kuik/registrymonitor_controller.go

@@ -165,7 +165,7 @@ func (r *RegistryMonitorReconciler) monitorAnImage(ctx context.Context, image *k
 
 	var lastErr error
 	if pullSecrets, err := image.GetPullSecrets(ctx, r.Client); err != nil {
-		image.Status.Upstream.Status = kuikv1alpha1.ImageStatusUpstreamInvalidAuth
+		image.Status.Upstream.Status = kuikv1alpha1.ImageStatusUpstreamUnavailableSecret
 		image.Status.Upstream.LastError = err.Error()
 		lastErr = err
 	} else {