Skip to content
This repository was archived by the owner on Oct 2, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions clouddriver-google/clouddriver-google.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading