Merge pull request #679 from bradmwilliams/jira-worker-update

Drop to a single Jira Worker

Author: openshift-merge-bot[bot]

cmd/release-controller/controller.go

@@ -445,9 +445,9 @@ func (c *Controller) run(workers int, stopCh <-chan struct{}) {
 		go wait.Until(c.auditWorker, time.Second, stopCh)
 	}
 
-	for range workers {
-		go wait.Until(c.jiraWorker, time.Second, stopCh)
-	}
+	//for range workers {
+	go wait.Until(c.jiraWorker, time.Second, stopCh)
+	//}
 
 	for range workers {
 		go wait.Until(c.legacyResultsWorker, time.Second, stopCh)

cmd/release-controller/sync_gc.go

@@ -6,12 +6,15 @@ import (
 	"time"
 
 	releasecontroller "github.com/openshift/release-controller/pkg/release-controller"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/klog"
+
+	imagev1 "github.com/openshift/api/image/v1"
 )
 
 // garbageCollectSync checks for unreferenced objects and deletes them. Because this can run
@@ -122,11 +125,55 @@ func (c *Controller) garbageCollectSync() error {
 		}
 	}
 
-	// all releasepayloads created for releases that no longer exist should be deleted
+	// all releasepayloads created for releases that no longer exist should be garbage collected
+	// create a tag in quay.io with remove__ prefix - the pruner will handle deletion of both tags
 	for _, payload := range payloads {
 		if active.Has(payload.Name) {
 			continue
 		}
+		// Get the target ImageStream from the ReleasePayload coordinates
+		targetNamespace := payload.Spec.PayloadCoordinates.Namespace
+		targetImageStreamName := payload.Spec.PayloadCoordinates.ImagestreamName
+		if len(targetNamespace) == 0 || len(targetImageStreamName) == 0 {
+			utilruntime.HandleError(fmt.Errorf("releasepayload %s/%s missing payload coordinates", payload.Namespace, payload.Name))
+			continue
+		}
+		// Get the target ImageStream
+		targetImageStream, err := c.imageClient.ImageStreams(targetNamespace).Get(context.TODO(), targetImageStreamName, metav1.GetOptions{})
+		if err != nil {
+			if errors.IsNotFound(err) {
+				continue
+			}
+			utilruntime.HandleError(fmt.Errorf("can't get target imagestream %s/%s for releasepayload %s/%s: %v", targetNamespace, targetImageStreamName, payload.Namespace, payload.Name, err))
+			continue
+		}
+		// Create a tag with remove__ prefix pointing to the original tag
+		removeTagName := fmt.Sprintf("remove__%s", payload.Name)
+		// Check if the remove__ tag already exists
+		if existingTag := releasecontroller.FindTagReference(targetImageStream, removeTagName); existingTag != nil {
+			// Tag already exists, just delete the ReleasePayload
+			klog.V(2).Infof("Removing orphaned releasepayload %s/%s (remove__ tag already exists)", payload.Namespace, payload.Name)
+			if err := c.releasePayloadClient.ReleasePayloads(payload.Namespace).Delete(context.TODO(), payload.Name, metav1.DeleteOptions{}); err != nil && !errors.IsNotFound(err) {
+				utilruntime.HandleError(fmt.Errorf("can't delete orphaned releasepayload %s/%s: %v", payload.Namespace, payload.Name, err))
+			}
+			continue
+		}
+		// Create the tag in the target ImageStream
+		target := targetImageStream.DeepCopy()
+		target.Spec.Tags = append(target.Spec.Tags, imagev1.TagReference{
+			Name: removeTagName,
+			From: &corev1.ObjectReference{
+				Kind: "ImageStreamTag",
+				Name: payload.Name,
+			},
+			ImportPolicy: imagev1.TagImportPolicy{ImportMode: imagev1.ImportModePreserveOriginal},
+		})
+		klog.V(2).Infof("Garbage collecting releasepayload %s/%s by creating tag %s/%s:%s", payload.Namespace, payload.Name, targetNamespace, targetImageStreamName, removeTagName)
+		_, err = c.imageClient.ImageStreams(target.Namespace).Update(context.TODO(), target, metav1.UpdateOptions{})
+		if err != nil && !errors.IsNotFound(err) {
+			utilruntime.HandleError(fmt.Errorf("can't create tag %s/%s:%s for garbage collection: %v", targetNamespace, targetImageStreamName, removeTagName, err))
+			continue
+		}
 		klog.V(2).Infof("Removing orphaned releasepayload %s/%s", payload.Namespace, payload.Name)
 		if err := c.releasePayloadClient.ReleasePayloads(payload.Namespace).Delete(context.TODO(), payload.Name, metav1.DeleteOptions{}); err != nil && !errors.IsNotFound(err) {
 			utilruntime.HandleError(fmt.Errorf("can't delete orphaned releasepayload %s/%s: %v", payload.Namespace, payload.Name, err))

pkg/release-controller/types.go

@@ -152,7 +152,7 @@ type ReleaseConfig struct {
 	// AlternateImageRepository is the full path to an external Image Repository where we
 	// will mirror Accepted releases to.
 	// For example:
-	//   "alternateImageRepository": "quay.io/openshift-release-dev/dev-release"
+	//   "alternateImageRepository": "quay.io/openshift/ci"
 	AlternateImageRepository string `json:"alternateImageRepository"`
 
 	// AlternateImageRepositorySecret is the name of the secret containing credentials to the