for the CI test - Revert "Added a fix to update bucket tagging when OBC labels are changed"

This reverts commit 2a1d782.

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

Author: shirady

pkg/controller/obc/obc_controller.go

@@ -1,50 +1,12 @@
 package obc
 
 import (
-	"context"
-	"reflect"
-
-	nbv1 "github.com/noobaa/noobaa-operator/v5/pkg/apis/noobaa/v1alpha1"
-	"github.com/noobaa/noobaa-operator/v5/pkg/system"
-	"github.com/noobaa/noobaa-operator/v5/pkg/util"
-
 	"github.com/noobaa/noobaa-operator/v5/pkg/obc"
-	"k8s.io/client-go/tools/cache"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
 
 // Add starts running the noobaa bucket provisioner
 func Add(mgr manager.Manager) error {
-
-	// Creating informer to watch OBC
-	informer, err := mgr.GetCache().GetInformer(context.TODO(), &nbv1.ObjectBucketClaim{})
-	if err != nil {
-		return err
-	}
-
-	_, _ = informer.AddEventHandler(cache.ResourceEventHandlerFuncs{
-		UpdateFunc: func(oldObj, newObj interface{}) {
-			oldOBC, okOld := oldObj.(*nbv1.ObjectBucketClaim)
-			newOBC, okNew := newObj.(*nbv1.ObjectBucketClaim)
-			if !okOld || !okNew {
-				return
-			}
-
-			// supports only updating of bucket tagging with OBC labels
-			if !reflect.DeepEqual(oldOBC.Labels, newOBC.Labels) {
-				sysClient, err := system.Connect(false)
-				if err != nil {
-					util.Logger().Errorf("Failed to connect to the system for OBC %s: %v", newOBC.Name, err)
-					return
-				}
-				if err := obc.UpdateBucketTagging(sysClient, newOBC); err != nil {
-					util.Logger().Errorf("Failed to update bucket tagging for OBC %s: %v", newOBC.Name, err)
-					return
-				}
-			}
-		},
-	})
-
 	return obc.RunProvisioner(
 		mgr.GetClient(),
 		mgr.GetScheme(),

pkg/obc/provisioner.go

@@ -130,9 +130,9 @@ func (p *Provisioner) Provision(bucketOptions *obAPI.BucketOptions) (*nbv1.Objec
 		return nil, err
 	}
 
-	err = UpdateBucketTagging(r.SysClient, r.OBC)
+	err = r.putBucketTagging()
 	if err != nil {
-		logrus.Warnf("failed executing UpdateBucketTagging on bucket: %v, %v", r.BucketName, err)
+		logrus.Warnf("failed executing putBucketTagging on bucket: %v, %v", r.BucketName, err)
 	}
 	return r.OB, nil
 }
@@ -243,58 +243,6 @@ func (p *Provisioner) Update(ob *nbv1.ObjectBucket) error {
 	return nil
 }
 
-// UpdateBucketTagging is not handled by lib-bucket-provisioner and is a customized function to update bucket tagging with OBC labels
-func UpdateBucketTagging(sysClient *system.Client, obc *nbv1.ObjectBucketClaim) error {
-	if obc == nil || obc.Labels == nil {
-		return fmt.Errorf("OBC is not provided or doesn't contain any label")
-	}
-
-	client := &http.Client{Transport: util.InsecureHTTPTransport}
-	s3Status := &sysClient.NooBaa.Status.Services.ServiceS3
-	s3Config := &aws.Config{
-		Credentials: credentials.NewStaticCredentials(
-			sysClient.SecretAdmin.StringData["AWS_ACCESS_KEY_ID"],
-			sysClient.SecretAdmin.StringData["AWS_SECRET_ACCESS_KEY"],
-			"",
-		),
-		Region:           aws.String("us-east-1"),
-		Endpoint:         aws.String(s3Status.InternalDNS[0]),
-		S3ForcePathStyle: aws.Bool(true),
-		HTTPClient:       client,
-	}
-	s3Session, err := session.NewSession(s3Config)
-	if err != nil {
-		return err
-	}
-	s3Client := s3.New(s3Session)
-
-	// convert labels to tagging array
-	taggingArray := []*s3.Tag{}
-	for key, value := range obc.Labels {
-		// no need to put tagging of these labels
-		if !util.Contains([]string{"app", "noobaa-domain", "bucket-provisioner"}, key) {
-			keyPointer := key
-			valuePointer := value
-			taggingArray = append(taggingArray, &s3.Tag{Key: &keyPointer, Value: &valuePointer})
-		}
-	}
-	logrus.Infof("put bucket tagging on bucket: %s tagging: %+v ", obc.Spec.BucketName, taggingArray)
-	if len(taggingArray) == 0 {
-		return nil
-	}
-	_, err = s3Client.PutBucketTagging(&s3.PutBucketTaggingInput{
-		Bucket: &obc.Spec.BucketName,
-		Tagging: &s3.Tagging{
-			TagSet: taggingArray,
-		},
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // BucketRequest is the context of handling a single bucket request
 type BucketRequest struct {
 	Provisioner *Provisioner
@@ -727,6 +675,54 @@ func (r *BucketRequest) DeleteBucket() error {
 	return nil
 }
 
+// putBucketTagging calls s3 putBucketTagging on the created noobaa bucket
+func (r *BucketRequest) putBucketTagging() error {
+
+	client := &http.Client{Transport: util.InsecureHTTPTransport}
+	s3Status := &r.SysClient.NooBaa.Status.Services.ServiceS3
+	s3Config := &aws.Config{
+		Credentials: credentials.NewStaticCredentials(
+			r.SysClient.SecretAdmin.StringData["AWS_ACCESS_KEY_ID"],
+			r.SysClient.SecretAdmin.StringData["AWS_SECRET_ACCESS_KEY"],
+			"",
+		),
+		Region:           aws.String("us-east-1"),
+		Endpoint:         aws.String(s3Status.InternalDNS[0]),
+		S3ForcePathStyle: aws.Bool(true),
+		HTTPClient:       client,
+	}
+	s3Session, err := session.NewSession(s3Config)
+	if err != nil {
+		return err
+	}
+	s3Client := s3.New(s3Session)
+
+	// convert labels to tagging array
+	taggingArray := []*s3.Tag{}
+	for key, value := range r.OBC.Labels {
+		// no need to put tagging of these labels
+		if !util.Contains([]string{"app", "noobaa-domain", "bucket-provisioner"}, key) {
+			keyPointer := key
+			valuePointer := value
+			taggingArray = append(taggingArray, &s3.Tag{Key: &keyPointer, Value: &valuePointer})
+		}
+	}
+	logrus.Infof("put bucket tagging on bucket: %s tagging: %+v ", r.BucketName, taggingArray)
+	if len(taggingArray) == 0 {
+		return nil
+	}
+	_, err = s3Client.PutBucketTagging(&s3.PutBucketTaggingInput{
+		Bucket: &r.BucketName,
+		Tagging: &s3.Tagging{
+			TagSet: taggingArray,
+		},
+	})
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 // PrepareReplicationParams validates and prepare the replication params
 func PrepareReplicationParams(bucketName string, replicationPolicy string, update bool) (*nb.BucketReplicationParams, *nb.DeleteBucketReplicationParams, error) {
 

test/cli/test_cli_functions.sh

@@ -172,34 +172,6 @@ function timeout {
     done
 }
 
-function test_aws {
-     if [ "${1}" == "silence" ]; then
-        silence=true
-        shift
-    fi
-
-    local options=$*
-
-    NOOBAA_ACCESS_KEY=$(kuberun get secret noobaa-admin -n test -o json | jq -r '.data.AWS_ACCESS_KEY_ID|@base64d')
-    NOOBAA_SECRET_KEY=$(kuberun get secret noobaa-admin -n test -o json | jq -r '.data.AWS_SECRET_ACCESS_KEY|@base64d')
-    ENDPOINT=$(kuberun get noobaa noobaa -n test -o json | jq -r '.status.services.serviceS3.nodePorts[0]')
-
-    if [ -z "${NOOBAA_ACCESS_KEY}" ] || [ -z "${NOOBAA_SECRET_KEY}" ] || [ -z "${ENDPOINT}" ]; then
-        echo_time "❌  Failed to retrieve NooBaa credentials or endpoint, Exiting."
-        exit 1
-    fi
-
-    AWS_ACCESS_KEY_ID=$NOOBAA_ACCESS_KEY AWS_SECRET_ACCESS_KEY=$NOOBAA_SECRET_KEY AWS_EC2_METADATA_DISABLED=true \
-        aws --endpoint $ENDPOINT --no-verify-ssl ${options}
-
-    if [ $? -ne 0 ]; then
-        echo_time "❌  aws ${options} failed, Exiting"
-        exit 1
-    elif [ ! ${silence} ]; then
-        echo_time "✅  aws ${options} passed"
-    fi
-}
-
 function install {
     local use_obc_cleanup_policy
 
@@ -741,43 +713,11 @@ function obc_cycle {
         unset flag
     done
     check_obc
-    verify_bucket_tagging
 
     # aws s3 --endpoint-url XXX ls
     echo_time "✅  obc cycle is done"
 }
 
-function verify_bucket_tagging {
-    local obc_name="obc-buck-tagging"
-
-    echo_time "💬 Creating Object Bucket Claim (OBC): $obc_name"
-    test_noobaa --timeout obc create $obc_name
-
-    # fetching bucket_name from obc
-    bucket_name=$(kuberun get obc $obc_name -o json | jq -r '.spec.bucketName')
-
-    # updating the obc labels
-    new_label_key="test-label"
-    new_label_value="verified"
-    echo_time "💬 Updating OBC labels: $new_label_key=$new_label_value"
-    kuberun silence label obc $obc_name $new_label_key=$new_label_value --overwrite
-
-    # checking bucket tagging after updating obc labels
-    echo_time "💬 Fetching updated bucket tags for: $bucket_name"
-    tags=$(test_aws s3api get-bucket-tagging --bucket "$bucket_name" 2>/dev/null || echo "No Tags")
-
-    if [[ "$tags" == "No Tags" ]]; then
-        echo_time "❌  No tags found for bucket: $bucket_name"
-        exit 1
-    else
-        echo_time "✅  Bucket tagging verified: $tags"
-    fi
-
-    echo_time "💬  Deleting OBC: $obc_name"
-    test_noobaa --timeout obc delete ${obc_name}
-}
-
-
 function account_cycle {
     echo_time "💬  Starting the account cycle"
     local buckets=($(test_noobaa silence bucket list  | grep -v "BUCKET-NAME" | awk '{print $1}'))
@@ -1203,10 +1143,14 @@ function check_default_backingstore {
 
     echo_time "💬 Deleting Noobaa default backingstore and its connected instances"
     echo_time "💬 Deleting buckets"
-    test_aws s3 ls
-    for bucket in $(test_aws s3 ls | awk '{print $3}');
+    NOOBAA_ACCESS_KEY=$(kuberun get secret noobaa-admin -n test -o json | jq -r '.data.AWS_ACCESS_KEY_ID|@base64d')
+    NOOBAA_SECRET_KEY=$(kuberun get secret noobaa-admin -n test -o json | jq -r '.data.AWS_SECRET_ACCESS_KEY|@base64d')
+    ENDPOINT=$(kuberun get noobaa noobaa -n test -o json | jq -r '.status.services.serviceS3.nodePorts[0]')
+    echo $ENDPOINT
+    AWS_ACCESS_KEY_ID=$NOOBAA_ACCESS_KEY AWS_SECRET_ACCESS_KEY=$NOOBAA_SECRET_KEY AWS_EC2_METADATA_DISABLED=true aws --endpoint $ENDPOINT --no-verify-ssl s3 ls
+    for bucket in $(AWS_ACCESS_KEY_ID=$NOOBAA_ACCESS_KEY AWS_SECRET_ACCESS_KEY=$NOOBAA_SECRET_KEY AWS_EC2_METADATA_DISABLED=true aws --endpoint $ENDPOINT --no-verify-ssl s3 ls | awk '{print $3}'); 
     do  
-        test_aws s3 rb "s3://${bucket}" --force ;
+        AWS_ACCESS_KEY_ID=$NOOBAA_ACCESS_KEY AWS_SECRET_ACCESS_KEY=$NOOBAA_SECRET_KEY AWS_EC2_METADATA_DISABLED=true aws --endpoint $ENDPOINT --no-verify-ssl s3 rb "s3://${bucket}" --force ; 
     done
     "💬 Deleting non-default accounts"
     delete_account