feat(gce): support resource-manager-tags in GCE deployment (#6287)

spinnaker · Sep 27, 2024 · 88d1fd0 · 88d1fd0
1 parent 7be08cd
commit 88d1fd0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/clouddriver-google/clouddriver-google.gradle b/clouddriver-google/clouddriver-google.gradle
@@ -48,7 +48,3 @@ dependencies {
   testImplementation "org.springframework.boot:spring-boot-test"
   testImplementation "org.apache.groovy:groovy-test"
 }
-
-configurations.all {
-   resolutionStrategy.force 'com.google.apis:google-api-services-compute:beta-rev20201102-1.30.10'
-}
diff --git a/...flix/spinnaker/clouddriver/google/deploy/description/BaseGoogleInstanceDescription.groovy b/...flix/spinnaker/clouddriver/google/deploy/description/BaseGoogleInstanceDescription.groovy
@@ -68,6 +68,8 @@ class BaseGoogleInstanceDescription extends AbstractGoogleCredentialsDescription
 
   String accountName
 
+  Map<String, String> resourceManagerTags
+
   // The source of the image to deploy
   // ARTIFACT: An artifact of type gce/image stored in imageArtifact
   // STRING:   A string representing a GCE image name in the current

diff --git a/.../com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy b/.../com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy
@@ -425,7 +425,8 @@ class BasicGoogleDeployHandler implements DeployHandler<BasicGoogleDeployDescrip
                                                     tags: tags,
                                                     labels: labels,
                                                     scheduling: scheduling,
-                                                    serviceAccounts: serviceAccount)
+                                                    serviceAccounts: serviceAccount,
+                                                    resourceManagerTags: description.resourceManagerTags,)
 
     if (GCEUtil.isShieldedVmCompatible(bootImage)) {
       def shieldedVmConfig = GCEUtil.buildShieldedVmConfig(description)