updates to test so far

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

Author: everettraven

.github/workflows/e2e-tests.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Build controller image
         run: make e2e-build
       - name: Save image
-        run: docker save quay.io/operator-framework/olm:local -o olm-image.tar
+        run: docker save quay.io/operator-framework/olm:dev -o olm-image.tar
       - name: Upload Docker image as artifact
         uses: actions/upload-artifact@v4
         with:

pkg/controller/operators/olm/operatorgroup.go

@@ -808,6 +808,7 @@ func (a *Operator) copyToNamespace(prototype *v1alpha1.ClusterServiceVersion, ns
 
 	existing, err := a.copiedCSVLister.Namespace(nsTo).Get(prototype.GetName())
 	if apierrors.IsNotFound(err) {
+		prototype.Annotations[nonStatusCopyHashAnnotation] = nonstatus
 		created, err := a.client.OperatorsV1alpha1().ClusterServiceVersions(nsTo).Create(context.TODO(), prototype, metav1.CreateOptions{})
 		if err != nil {
 			return nil, fmt.Errorf("failed to create new CSV: %w", err)
@@ -816,6 +817,10 @@ func (a *Operator) copyToNamespace(prototype *v1alpha1.ClusterServiceVersion, ns
 		if _, err := a.client.OperatorsV1alpha1().ClusterServiceVersions(nsTo).UpdateStatus(context.TODO(), created, metav1.UpdateOptions{}); err != nil {
 			return nil, fmt.Errorf("failed to update status on new CSV: %w", err)
 		}
+		prototype.Annotations[statusCopyHashAnnotation] = status
+		if _, err = a.client.OperatorsV1alpha1().ClusterServiceVersions(nsTo).Update(context.TODO(), prototype, metav1.UpdateOptions{}); err != nil {
+			return nil, fmt.Errorf("failed to update annotations after updating status: %w", err)
+		}
 		return &v1alpha1.ClusterServiceVersion{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:      created.Name,

pkg/controller/operators/olm/operatorgroup_test.go

@@ -44,9 +44,12 @@ func TestCopyToNamespace(t *testing.T) {
 			Name:          "copy created if does not exist",
 			FromNamespace: "from",
 			ToNamespace:   "to",
+			Hash:          "hn-1",
+			StatusHash:    "hs",
 			Prototype: v1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "name",
+                    Annotations: map[string]string{},
 				},
 				Spec: v1alpha1.ClusterServiceVersionSpec{
 					Replaces: "replacee",
@@ -60,6 +63,9 @@ func TestCopyToNamespace(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "name",
 						Namespace: "to",
+                        Annotations: map[string]string{
+                            nonStatusCopyHashAnnotation: "hn-1",
+                        },
 					},
 					Spec: v1alpha1.ClusterServiceVersionSpec{
 						Replaces: "replacee",
@@ -80,6 +86,13 @@ func TestCopyToNamespace(t *testing.T) {
 						Phase: "waxing gibbous",
 					},
 				}),
+                ktesting.NewUpdateAction(gvr, "to", &v1alpha1.ClusterServiceVersion{
+                    ObjectMeta: metav1.ObjectMeta{
+                        Annotations: map[string]string{
+                            statusCopyHashAnnotation: "hs",
+                        },
+                    },
+                })
 			},
 			ExpectedResult: &v1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
@@ -97,6 +110,7 @@ func TestCopyToNamespace(t *testing.T) {
 			Prototype: v1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "name",
+                    Annotations: map[string]string{},
 				},
 				Spec: v1alpha1.ClusterServiceVersionSpec{
 					Replaces: "replacee",
@@ -150,6 +164,7 @@ func TestCopyToNamespace(t *testing.T) {
 			Prototype: v1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "name",
+                    Annotations: map[string]string{},
 				},
 				Spec: v1alpha1.ClusterServiceVersionSpec{
 					Replaces: "replacee",
@@ -203,6 +218,7 @@ func TestCopyToNamespace(t *testing.T) {
 			Prototype: v1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "name",
+                    Annotations: map[string]string{},
 				},
 				Spec: v1alpha1.ClusterServiceVersionSpec{
 					Replaces: "replacee",
@@ -270,6 +286,7 @@ func TestCopyToNamespace(t *testing.T) {
 			Prototype: v1alpha1.ClusterServiceVersion{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "name",
+                    Annotations: map[string]string{},
 				},
 			},
 			ExistingCopy: &metav1.PartialObjectMetadata{
@@ -311,10 +328,15 @@ func TestCopyToNamespace(t *testing.T) {
 				logger:          logger,
 			}
 
-			result, err := o.copyToNamespace(tc.Prototype.DeepCopy(), tc.FromNamespace, tc.ToNamespace, tc.Hash, tc.StatusHash)
+			proto := tc.Prototype.DeepCopy()
+			result, err := o.copyToNamespace(proto, tc.FromNamespace, tc.ToNamespace, tc.Hash, tc.StatusHash)
 
 			if tc.ExpectedError == nil {
 				require.NoError(t, err)
+				// if there is no error expected, ensure that the hash annotations are always present on the resulting CSV
+				annotations := proto.GetObjectMeta().GetAnnotations()
+				require.Equal(t, tc.Hash, annotations[nonStatusCopyHashAnnotation])
+				require.Equal(t, tc.StatusHash, annotations[statusCopyHashAnnotation])
 			} else {
 				require.EqualError(t, err, tc.ExpectedError.Error())
 			}