added freight ref to warehouse status and repo-commit mappings fetcher

Signed-off-by: Maksim Stankevic <[email protected]>

api/v1alpha1/warehouse_types.go

@@ -230,6 +230,8 @@ type WarehouseStatus struct {
 	// ObservedGeneration represents the .metadata.generation that this Warehouse
 	// was reconciled against.
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+	// FreightReference refers to the last Freight produced by this Warehouse
+	FreightReference string `json:"freightReference,omitempty"`
 }
 
 //+kubebuilder:object:root=true

charts/kargo/crds/kargo.akuity.io_warehouses.yaml

@@ -259,6 +259,10 @@ spec:
                 description: Error describes any errors that are preventing the Warehouse
                   controller from polling repositories to discover new Freight.
                 type: string
+              freightReference:
+                description: FreightReference refers to the last Freight produced
+                  by this Warehouse
+                type: string
               observedGeneration:
                 description: ObservedGeneration represents the .metadata.generation
                   that this Warehouse was reconciled against.

internal/controller/warehouses/git_repos_commits.go

@@ -0,0 +1,41 @@
+package warehouses
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	kargoapi "github.com/akuity/kargo/api/v1alpha1"
+)
+
+func (r *reconciler) getGitRepoCommitsMappings(
+	ctx context.Context,
+	freightId string,
+	ns string,
+) (map[string][]string, error) {
+
+	freight := kargoapi.Freight{}
+	if err := r.client.Get(
+		ctx,
+		client.ObjectKey{
+			Namespace: ns,
+			Name:      freightId,
+		},
+		&freight,
+	); err != nil {
+		return nil, errors.Wrapf(
+			err,
+			"error checking for existence of Freight with ID %q",
+			freightId,
+		)
+	}
+
+	result := map[string][]string{}
+	for _, commit := range freight.Commits {
+		result[commit.RepoURL] = []string{commit.ID, commit.Branch}
+	}
+
+	return result, nil
+
+}

internal/controller/warehouses/warehouses.go

@@ -93,6 +93,8 @@ type reconciler struct {
 
 	getAvailableFreightAliasFn func(context.Context) (string, error)
 
+	getGitRepoCommitsMappingsFn func(context.Context, string, string) (map[string][]string, error)
+
 	createFreightFn func(
 		context.Context,
 		client.Object,
@@ -162,6 +164,7 @@ func newReconciler(
 	r.selectChartVersionFn = helm.SelectChartVersion
 	r.selectCommitMetaFn = r.selectCommitMeta
 	r.getAvailableFreightAliasFn = r.getAvailableFreightAlias
+	r.getGitRepoCommitsMappingsFn = r.getGitRepoCommitsMappings
 	r.createFreightFn = kubeClient.Create
 	return r
 }
@@ -241,10 +244,19 @@ func (r *reconciler) syncWarehouse(
 ) (kargoapi.WarehouseStatus, error) {
 	status := *warehouse.Status.DeepCopy()
 	status.ObservedGeneration = warehouse.Generation
+	status.FreightReference = warehouse.Status.FreightReference
 	status.Error = "" // Clear any previous error
 
 	logger := logging.LoggerFromContext(ctx)
 
+	// debug
+	res, err := r.getGitRepoCommitsMappingsFn(ctx, warehouse.Status.FreightReference, warehouse.Namespace)
+	if err != nil {
+		return status,
+			errors.Wrap(err, "error getting git repos commits mappings")
+	}
+	logger.Debug("!!!DEBUG!!!", res)
+
 	freight, err := r.getLatestFreightFromReposFn(ctx, warehouse)
 	if err != nil {
 		return status,
@@ -283,6 +295,7 @@ func (r *reconciler) syncWarehouse(
 		freight.Name,
 		freight.Namespace,
 	)
+	status.FreightReference = freight.ID
 
 	return status, nil
 }

ui/src/gen/schema/warehouses.kargo.akuity.io_v1alpha1.json

@@ -178,6 +178,10 @@
           "description": "Error describes any errors that are preventing the Warehouse controller from polling repositories to discover new Freight.",
           "type": "string"
         },
+        "freightReference": {
+          "description": "FreightReference refers to the last Freight produced by this Warehouse",
+          "type": "string"
+        },
         "observedGeneration": {
           "description": "ObservedGeneration represents the .metadata.generation that this Warehouse was reconciled against.",
           "format": "int64",