From be612989da06e5338041349456f5293945e15000 Mon Sep 17 00:00:00 2001
From: Release Workflow <unifiedid-admin+release@thetradedesk.com>
Date: Wed, 17 Dec 2025 00:07:06 +0000
Subject: [PATCH 1/3] [CI Pipeline] Released patch version: 5.62.26

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5cd33af6a..6179d8668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-    <version>5.62.24</version>
+    <version>5.62.26</version>
   
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From ea0b95878bde945d186ee268e6ead388b95f808e Mon Sep 17 00:00:00 2001
From: way zheng <way.zheng@thetradedesk.com>
Date: Wed, 17 Dec 2025 15:26:51 -0800
Subject: [PATCH 2/3] Fix: Restore full secret path for API_TOKEN_SECRET_NAME
 in GCP operator

---
 scripts/gcp-oidc/terraform/main.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/gcp-oidc/terraform/main.tf b/scripts/gcp-oidc/terraform/main.tf
index 7a0141726..f67da53ee 100644
--- a/scripts/gcp-oidc/terraform/main.tf
+++ b/scripts/gcp-oidc/terraform/main.tf
@@ -108,7 +108,7 @@ resource "google_compute_instance_template" "uid_operator" {
       tee-container-log-redirect     = true
       tee-restart-policy             = "Never"
       tee-env-DEPLOYMENT_ENVIRONMENT = var.uid_deployment_env
-      tee-env-API_TOKEN_SECRET_NAME  = var.uid_operator_key_secret_name
+      tee-env-API_TOKEN_SECRET_NAME  = module.secret-manager.secret_versions[0]
       tee-env-CORE_BASE_URL          = var.uid_deployment_env == "integ" ? "https://core-integ.uidapi.com" : "https://core-prod.uidapi.com"
       tee-env-OPTOUT_BASE_URL        = var.uid_deployment_env == "integ" ? "https://optout-integ.uidapi.com" : "https://optout-prod.uidapi.com"
     },

From 67812bec1c805c639b581a76cf30f8e80521ed4f Mon Sep 17 00:00:00 2001
From: Weihe Zheng <way.zheng@thetradedesk.com>
Date: Wed, 17 Dec 2025 16:51:55 -0800
Subject: [PATCH 3/3] Fix version conflict in pom.xml

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3e70e62a4..ee2190f20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,7 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-<<<<<<< HEAD
-    <version>5.62.26</version>
-=======
     <version>5.62.24-r0</version>
->>>>>>> 1146c822367d6eabb0ea23afde41d59052ec887a
   
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>