Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(gce): add partnerMetadata in instanceProperties for GCE deployment #6297

Merged
merged 2 commits into from
Oct 17, 2024
Merged

feat(gce): add partnerMetadata in instanceProperties for GCE deployment #6297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
319cf76
feat(gce): add partner metadata in instanceProperties
edgarulg Oct 17, 2024
8a26b1a
feat(gce): format instanceProperties
edgarulg Oct 17, 2024
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
2 changes: 2 additions & 0 deletions ...flix/spinnaker/clouddriver/google/deploy/description/BaseGoogleInstanceDescription.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

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

import com.google.api.services.compute.model.StructuredEntries
import com.netflix.spinnaker.clouddriver.google.model.GoogleDisk
import com.netflix.spinnaker.clouddriver.google.model.GoogleLabeledResource
import com.netflix.spinnaker.kork.artifacts.model.Artifact
Expand Down Expand Up @@ -69,6 +70,7 @@ class BaseGoogleInstanceDescription extends AbstractGoogleCredentialsDescription
String accountName

Map<String, String> resourceManagerTags
Map<String, StructuredEntries> partnerMetadata

// The source of the image to deploy
// ARTIFACT: An artifact of type gce/image stored in imageArtifact
Expand Down
25 changes: 14 additions & 11 deletions .../com/netflix/spinnaker/clouddriver/google/deploy/handlers/BasicGoogleDeployHandler.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,17 +416,20 @@ class BasicGoogleDeployHandler implements DeployHandler<BasicGoogleDeployDescrip
"Accelerators are only supported with regional server groups if the zones are specified by the user.");
}

def instanceProperties = new InstanceProperties(machineType: machineTypeName,
disks: attachedDisks,
guestAccelerators: description.acceleratorConfigs ?: [],
networkInterfaces: [networkInterface],
canIpForward: canIpForward,
metadata: metadata,
tags: tags,
labels: labels,
scheduling: scheduling,
serviceAccounts: serviceAccount,
resourceManagerTags: description.resourceManagerTags,)
def instanceProperties = new InstanceProperties(
machineType: machineTypeName,
disks: attachedDisks,
guestAccelerators: description.acceleratorConfigs ?: [],
networkInterfaces: [networkInterface],
canIpForward: canIpForward,
metadata: metadata,
tags: tags,
labels: labels,
scheduling: scheduling,
serviceAccounts: serviceAccount,
resourceManagerTags: description.resourceManagerTags,
partnerMetadata: description.partnerMetadata,
)

if (GCEUtil.isShieldedVmCompatible(bootImage)) {
def shieldedVmConfig = GCEUtil.buildShieldedVmConfig(description)
Expand Down
Loading