Address review comments

Signed-off-by: Rashmi Gottipati <[email protected]>
operator-framework · Aug 21, 2024 · ac8f6aa · ac8f6aa
1 parent 7249602
commit ac8f6aa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/api/core/v1alpha1/clustercatalog_types.go b/api/core/v1alpha1/clustercatalog_types.go
@@ -46,7 +46,7 @@ const (
 //+kubebuilder:resource:scope=Cluster
 //+kubebuilder:subresource:status
 //+kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`
-//+kubebuilder:printcolumn:name=LastUnpacked,type=date,JSONPath=`.metadata.LastUnpacked`
+//+kubebuilder:printcolumn:name=LastUnpacked,type=date,JSONPath=`.status.LastUnpacked`
 //+kubebuilder:printcolumn:name=Age,type=date,JSONPath=`.metadata.creationTimestamp`
 
 // ClusterCatalog is the Schema for the ClusterCatalogs API

diff --git a/internal/controllers/core/clustercatalog_controller.go b/internal/controllers/core/clustercatalog_controller.go
@@ -160,7 +160,15 @@ func (r *ClusterCatalogReconciler) reconcile(ctx context.Context, catalog *v1alp
 		}
 		contentURL = r.Storage.ContentURL(catalog.Name)
 
-		updateStatusUnpacked(&catalog.Status, unpackResult, contentURL, catalog.Generation, unpackResult.ResolvedSource.Image.LastUnpacked)
+		var lastUnpacked metav1.Time
+
+		if unpackResult != nil && unpackResult.ResolvedSource != nil && unpackResult.ResolvedSource.Image != nil {
+			lastUnpacked = unpackResult.ResolvedSource.Image.LastUnpacked
+		} else {
+			lastUnpacked = metav1.Time{}
+		}
+
+		updateStatusUnpacked(&catalog.Status, unpackResult, contentURL, catalog.Generation, lastUnpacked)
 
 		var requeueAfter time.Duration
 		switch catalog.Spec.Source.Type {