Skip to content

Commit aab2a60

Browse files
authored
feat(gce): add partnerMetadata in instanceProperties for GCE deployment (#6297)
* feat(gce): add partner metadata in instanceProperties * feat(gce): format instanceProperties
1 parent f9afff4 commit aab2a60

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/description/BaseGoogleInstanceDescription.groovy

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.netflix.spinnaker.clouddriver.google.deploy.description
1818

19+
import com.google.api.services.compute.model.StructuredEntries
1920
import com.netflix.spinnaker.clouddriver.google.model.GoogleDisk
2021
import com.netflix.spinnaker.clouddriver.google.model.GoogleLabeledResource
2122
import com.netflix.spinnaker.kork.artifacts.model.Artifact
@@ -69,6 +70,7 @@ class BaseGoogleInstanceDescription extends AbstractGoogleCredentialsDescription
6970
String accountName
7071

7172
Map<String, String> resourceManagerTags
73+
Map<String, StructuredEntries> partnerMetadata
7274

7375
// The source of the image to deploy
7476
// ARTIFACT: An artifact of type gce/image stored in imageArtifact

clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -416,17 +416,20 @@ class BasicGoogleDeployHandler implements DeployHandler<BasicGoogleDeployDescrip
416416
"Accelerators are only supported with regional server groups if the zones are specified by the user.");
417417
}
418418

419-
def instanceProperties = new InstanceProperties(machineType: machineTypeName,
420-
disks: attachedDisks,
421-
guestAccelerators: description.acceleratorConfigs ?: [],
422-
networkInterfaces: [networkInterface],
423-
canIpForward: canIpForward,
424-
metadata: metadata,
425-
tags: tags,
426-
labels: labels,
427-
scheduling: scheduling,
428-
serviceAccounts: serviceAccount,
429-
resourceManagerTags: description.resourceManagerTags,)
419+
def instanceProperties = new InstanceProperties(
420+
machineType: machineTypeName,
421+
disks: attachedDisks,
422+
guestAccelerators: description.acceleratorConfigs ?: [],
423+
networkInterfaces: [networkInterface],
424+
canIpForward: canIpForward,
425+
metadata: metadata,
426+
tags: tags,
427+
labels: labels,
428+
scheduling: scheduling,
429+
serviceAccounts: serviceAccount,
430+
resourceManagerTags: description.resourceManagerTags,
431+
partnerMetadata: description.partnerMetadata,
432+
)
430433

431434
if (GCEUtil.isShieldedVmCompatible(bootImage)) {
432435
def shieldedVmConfig = GCEUtil.buildShieldedVmConfig(description)

0 commit comments

Comments
 (0)