add support for universe domain for backup and volume snapshot

Author: mmohamed

velero-plugin-for-gcp/object_store.go

@@ -211,7 +211,12 @@ func (o *ObjectStore) initFromComputeEngine(config map[string]string) error {
 	if !ok {
 		return errors.Errorf("serviceAccount is expected to be provided as an item in BackupStorageLocation's config")
 	}
-	o.iamSvc, err = iamcredentials.NewService(context.Background())
+	clientOptions := []option.ClientOption{}
+	// if using a universeDomain, we need to pass it when initiate a new iam credentials service
+	if universeDomain, ok := config[universeDomainKey]; ok {
+		clientOptions = append(clientOptions, option.WithUniverseDomain(universeDomain))
+	}
+	o.iamSvc, err = iamcredentials.NewService(context.Background(), clientOptions...)
 	return err
 }
 

velero-plugin-for-gcp/volume_snapshotter.go

@@ -40,11 +40,12 @@ import (
 )
 
 const (
-	zoneSeparator       = "__"
-	projectKey          = "project"
-	snapshotLocationKey = "snapshotLocation"
-	snapshotTypeKey     = "snapshotType"
-	volumeProjectKey    = "volumeProject"
+	zoneSeparator       		= "__"
+	projectKey          		= "project"
+	snapshotLocationKey 		= "snapshotLocation"
+	snapshotTypeKey     		= "snapshotType"
+	volumeProjectKey    		= "volumeProject"
+	snapshotUniverseDomainKey   = "universeDomain"
 )
 
 var pdCSIDriver = map[string]bool{
@@ -75,6 +76,7 @@ func (b *VolumeSnapshotter) Init(config map[string]string) error {
 		projectKey,
 		credentialsFileConfigKey,
 		volumeProjectKey,
+		snapshotUniverseDomainKey,
 	); err != nil {
 		return err
 	}
@@ -136,6 +138,11 @@ func (b *VolumeSnapshotter) Init(config map[string]string) error {
 		return errors.Errorf("unsupported snapshot type: %q", snapshotType)
 	}
 
+	// if universeDomain is provided, we need to pass it when creating new compute service client.
+	if snapshotUniverseDomain, ok := config[snapshotUniverseDomainKey]; ok {
+		clientOptions = append(clientOptions, option.WithUniverseDomain(snapshotUniverseDomain))
+	}
+
 	gce, err := compute.NewService(context.TODO(), clientOptions...)
 	if err != nil {
 		return errors.WithStack(err)

velero-plugin-for-gcp/volume_snapshotter_test.go

@@ -470,12 +470,13 @@ func TestInit(t *testing.T) {
 			},
 		},
 		{
-			name: "Init with archive snapshot type.",
+			name: "Init with archive snapshot type and custom universe domain.",
 			config: map[string]string{
 				"project":          "project-a",
 				"snapshotLocation": "default",
 				"snapshotType":     "archive",
 				"volumeProject":    "project-b",
+				"universeDomain": 	"googleapis-ppd.com",
 			},
 			expectedVolumeSnapshotter: VolumeSnapshotter{
 				snapshotLocation: "default",

volumesnapshotlocation.md

@@ -46,4 +46,9 @@ spec:
     #
     # Optional (default to STANDARD).
     snapshotType: snapshot-type
+
+    # Configuration of the universe domain.
+    #
+    # Optional.
+    universeDomain: googleapis.com
 ```