Merge pull request #228 from 7sinStone/feature/add-support-for-non-default-google-cloud-universe-domain

feat: Add support for non-default google cloud universe domain

Author: kaovilai

backupstoragelocation.md

@@ -48,4 +48,9 @@ spec:
     #
     # Optional.
     storeEndpoint: storage-example.p.googleapis.com
+
+    # Configuration of the universe domain
+    #
+    # Optional.
+    universeDomain: googleapis.com
 ```

changelogs/unreleased/228-7sinStone.md

@@ -0,0 +1,14 @@
+# Add universeDomain parameter for GCS client
+
+**Type:** Feature
+
+**Description:**
+Introduce a new `universeDomain` key in the BackupStorageLocation `spec.config` map,
+allowing users to override the default Google Storage domain (defaults to `"googleapis.com"`).
+
+**Motivation:**
+- Support custom or private GCS-compatible endpoints (e.g. testing, on‑prem).
+- Align with Helm chart support for `universeDomain`.
+
+**Changes:**
+- Updated `object_storage.go` to inject `option.WithUniverseDomain(...)`.

velero-plugin-for-gcp/object_store.go

@@ -37,9 +37,10 @@ import (
 
 const (
 	kmsKeyNameConfigKey      = "kmsKeyName"
-	serviceAccountConfig     = "serviceAccount"
+	serviceAccountConfigKey     = "serviceAccount"
 	credentialsFileConfigKey = "credentialsFile"
 	storeEndpointConfigKey   = "storeEndpoint"
+	universeDomainKey   = "universeDomain"
 )
 
 // bucketWriter wraps the GCP SDK functions for accessing object store so they can be faked for testing.
@@ -100,9 +101,10 @@ func (o *ObjectStore) Init(config map[string]string) error {
 	if err := veleroplugin.ValidateObjectStoreConfigKeys(
 		config,
 		kmsKeyNameConfigKey,
-		serviceAccountConfig,
+		serviceAccountConfigKey,
 		credentialsFileConfigKey,
 		storeEndpointConfigKey,
+		universeDomainKey,
 	); err != nil {
 		return err
 	}
@@ -146,6 +148,11 @@ func (o *ObjectStore) Init(config map[string]string) error {
 		clientOptions = append(clientOptions, option.WithEndpoint(endpoint))
 	}
 
+	// if using a universeDomain, we need to pass it when creating the object store client
+	if universeDomain, ok := config[universeDomainKey]; ok {
+		clientOptions = append(clientOptions, option.WithUniverseDomain(universeDomain))
+	}
+
 	if creds.JSON != nil {
 		o.fileCredType, err = getSecretAccountTypeKey(creds.JSON)
 		if err != nil {