Merge pull request #872 from bharath-b-rh/cfe-682

CFE-682 : Add user defined labels to the GCP buckets created

Author: openshift-merge-robot

pkg/storage/gcs/gcp_labels_tags.go

@@ -0,0 +1,37 @@
+package gcs
+
+import (
+	"fmt"
+
+	"k8s.io/klog/v2"
+
+	configlisters "github.com/openshift/client-go/config/listers/config/v1"
+	"github.com/openshift/cluster-image-registry-operator/pkg/storage/util"
+)
+
+const (
+	// ocpDefaultLabelFmt is the format string for the default label
+	// added to the OpenShift created GCP resources.
+	ocpDefaultLabelFmt = "kubernetes-io-cluster-%s"
+)
+
+func getUserLabels(infraLister configlisters.InfrastructureLister) (map[string]string, error) {
+	infra, err := util.GetInfrastructure(infraLister)
+	if err != nil {
+		klog.Errorf("getUserLabels: failed to read infrastructure/cluster resource: %w", err)
+		return nil, err
+	}
+	// add OCP default label along with user-defined labels
+	labels := map[string]string{
+		fmt.Sprintf(ocpDefaultLabelFmt, infra.Status.InfrastructureName): "owned",
+	}
+	// get user-defined labels in Infrastructure.Status.GCP
+	if infra.Status.PlatformStatus != nil &&
+		infra.Status.PlatformStatus.GCP != nil &&
+		infra.Status.PlatformStatus.GCP.ResourceLabels != nil {
+		for _, label := range infra.Status.PlatformStatus.GCP.ResourceLabels {
+			labels[label.Key] = label.Value
+		}
+	}
+	return labels, nil
+}

pkg/storage/gcs/gcs.go

@@ -255,8 +255,14 @@ func (d *driver) CreateStorage(cr *imageregistryv1.Config) error {
 		bucketAttrs := gstorage.BucketAttrs{Location: d.Config.Region}
 		bucket = gclient.Bucket(d.Config.Bucket)
 
-		err := bucket.Create(d.Context, d.Config.ProjectID, &bucketAttrs)
+		labels, err := getUserLabels(d.Listers.Infrastructures)
 		if err != nil {
+			return err
+		}
+		klog.V(1).Infof("createStorage: %v list of labels will be applied to %s bucket", labels, d.Config.Bucket)
+		bucketAttrs.Labels = labels
+
+		if err := bucket.Create(d.Context, d.Config.ProjectID, &bucketAttrs); err != nil {
 			if gerr, ok := err.(*gapi.Error); ok {
 				util.UpdateCondition(cr, defaults.StorageExists, operatorapi.ConditionFalse, strconv.Itoa(gerr.Code), gerr.Error())
 				return err
@@ -275,6 +281,10 @@ func (d *driver) CreateStorage(cr *imageregistryv1.Config) error {
 		cr.Spec.Storage.GCS = d.Config.DeepCopy()
 
 		util.UpdateCondition(cr, defaults.StorageExists, operatorapi.ConditionTrue, "Creation Successful", "GCS bucket was successfully created")
+		if len(bucketAttrs.Labels) > 0 {
+			util.UpdateCondition(cr, defaults.StorageLabeled, operatorapi.ConditionTrue, "Bucket Labeled Successfully",
+				fmt.Sprintf("Successfully added user-defined labels to %s storage bucket", d.Config.Bucket))
+		}
 	}
 
 	// TODO: Wait until the bucket exists