Skip to content
This repository was archived by the owner on Oct 2, 2025. It is now read-only.

Commit efbb01a

Browse files
edgarulgedgarulg
committed
fix(gce): workaround upgrade issues
1 parent 638ef9a commit efbb01a

File tree

8 files changed

+42
-44
lines changed

8 files changed

+42
-44
lines changed

‎clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/DeleteGoogleAutoscalingPolicyAtomicOperation.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package com.netflix.spinnaker.clouddriver.google.deploy.ops
1818

1919
import com.google.api.services.compute.Compute
20-
import com.google.api.services.compute.model.InstanceGroupManagersSetAutoHealingRequest
20+
//import com.google.api.services.compute.model.InstanceGroupManagersSetAutoHealingRequest
2121
import com.google.api.services.compute.model.InstanceTemplate
22-
import com.google.api.services.compute.model.RegionInstanceGroupManagersSetAutoHealingRequest
22+
//import com.google.api.services.compute.model.RegionInstanceGroupManagersSetAutoHealingRequest
2323
import com.netflix.spinnaker.clouddriver.data.task.Task
2424
import com.netflix.spinnaker.clouddriver.data.task.TaskRepository
2525
import com.netflix.spinnaker.clouddriver.google.GoogleExecutor
@@ -85,7 +85,7 @@ class DeleteGoogleAutoscalingPolicyAtomicOperation extends GoogleAtomicOperation
8585
if (description.deleteAutoHealingPolicy) {
8686
task.updateStatus BASE_PHASE, "Initializing deletion of autoHealing policy for $description.serverGroupName..."
8787
if (isRegional) {
88-
def request = new RegionInstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies([])
88+
// def request = new RegionInstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies([])
8989
def deleteOp = timeExecute(
9090
compute.regionInstanceGroupManagers().setAutoHealingPolicies(project, region, serverGroupName, request),
9191
"compute.regionInstanceGroupManagers.setAutoHealingPolicies",
@@ -94,7 +94,7 @@ class DeleteGoogleAutoscalingPolicyAtomicOperation extends GoogleAtomicOperation
9494
deleteOp.getName(), null, task, "autoHealing policy for $serverGroupName", BASE_PHASE)
9595
deletePolicyMetadata(compute, credentials, project, GCEUtil.buildRegionalServerGroupUrl(project, region, serverGroupName))
9696
} else {
97-
def request = new InstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies([])
97+
// def request = new InstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies([])
9898
def deleteOp = timeExecute(
9999
compute.instanceGroupManagers().setAutoHealingPolicies(project, zone, serverGroupName, request),
100100
"compute.instanceGroupManagers.setAutoHealingPolicies",

‎clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/UpsertGoogleAutoscalingPolicyAtomicOperation.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class UpsertGoogleAutoscalingPolicyAtomicOperation extends GoogleAtomicOperation
153153
GCEUtil.buildAutoHealingPolicyDescriptionFromAutoHealingPolicy(serverGroup.autoHealingPolicy)
154154

155155
def regionalRequest = { List<InstanceGroupManagerAutoHealingPolicy> policy ->
156-
def request = new RegionInstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies(policy)
156+
// def request = new RegionInstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies(policy)
157157
def autoHealingOp = timeExecute(
158158
compute.regionInstanceGroupManagers().setAutoHealingPolicies(project, region, serverGroupName, request),
159159
"compute.regionInstanceGroupManagers.setAutoHealingPolicies",
@@ -163,7 +163,7 @@ class UpsertGoogleAutoscalingPolicyAtomicOperation extends GoogleAtomicOperation
163163
}
164164

165165
def zonalRequest = { List<InstanceGroupManagerAutoHealingPolicy> policy ->
166-
def request = new InstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies(policy)
166+
// def request = new InstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies(policy)
167167
def autoHealingOp = timeExecute(
168168
compute.instanceGroupManagers().setAutoHealingPolicies(project, zone, serverGroupName, request),
169169
"compute.instanceGroupManagers.setAutoHealingPolicies",

‎clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/snapshot/SaveSnapshotAtomicOperation.groovy‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,9 @@ class SaveSnapshotAtomicOperation implements AtomicOperation<Void> {
263263
instanceTemplateMap.metadata[item.key] = item.value
264264
}
265265
}
266-
if (instanceTemplate.properties.shieldedVmConfig) {
267-
addShieldedVmConfigToInstanceTemplateMap(instanceTemplate.properties.shieldedVmConfig as ShieldedVmConfig, instanceTemplateMap)
268-
}
266+
// if (instanceTemplate.properties.shieldedVmConfig) {
267+
// addShieldedVmConfigToInstanceTemplateMap(instanceTemplate.properties.shieldedVmConfig as ShieldedVmConfig, instanceTemplateMap)
268+
// }
269269
numInstanceTemplates++
270270
resourceMap.google_compute_instance_template[instanceTemplate.name as String] = instanceTemplateMap
271271

@@ -286,19 +286,19 @@ class SaveSnapshotAtomicOperation implements AtomicOperation<Void> {
286286
return null
287287
}
288288

289-
private Void addShieldedVmConfigToInstanceTemplateMap(ShieldedVmConfig shieldedVmConfig, Map instanceTemplateMap) {
290-
instanceTemplateMap.shielded_vm_config = [:]
291-
if (shieldedVmConfig.enableSecureBoot != null) {
292-
instanceTemplateMap.shielded_vm_config.enable_secure_boot = shieldedVmConfig.enableSecureBoot
293-
}
294-
if (shieldedVmConfig.enableVtpm != null) {
295-
instanceTemplateMap.shielded_vm_config.enable_vtpm = shieldedVmConfig.enableVtpm
296-
}
297-
if (shieldedVmConfig.enableIntegrityMonitoring != null) {
298-
instanceTemplateMap.shielded_vm_config.enable_integrity_monitoring = shieldedVmConfig.enableIntegrityMonitoring
299-
}
300-
return null
301-
}
289+
// private Void addShieldedVmConfigToInstanceTemplateMap(ShieldedVmConfig shieldedVmConfig, Map instanceTemplateMap) {
290+
// instanceTemplateMap.shielded_vm_config = [:]
291+
// if (shieldedVmConfig.enableSecureBoot != null) {
292+
// instanceTemplateMap.shielded_vm_config.enable_secure_boot = shieldedVmConfig.enableSecureBoot
293+
// }
294+
// if (shieldedVmConfig.enableVtpm != null) {
295+
// instanceTemplateMap.shielded_vm_config.enable_vtpm = shieldedVmConfig.enableVtpm
296+
// }
297+
// if (shieldedVmConfig.enableIntegrityMonitoring != null) {
298+
// instanceTemplateMap.shielded_vm_config.enable_integrity_monitoring = shieldedVmConfig.enableIntegrityMonitoring
299+
// }
300+
// return null
301+
// }
302302

303303
private Void addNetworkInterfacesToInstanceTemplateMap(List<NetworkInterface> networkInterfaces, Map instanceTemplateMap) {
304304
instanceTemplateMap.network_interface = []
@@ -708,15 +708,15 @@ class SaveSnapshotAtomicOperation implements AtomicOperation<Void> {
708708
return scheduling
709709
}
710710

711-
private ShieldedVmConfig convertMapToShieldedVmConfig(Map shieldedVmConfigMap) {
712-
713-
ShieldedVmConfig shieldedVmConfig = new ShieldedVmConfig()
714-
715-
shieldedVmConfig.enableSecureBoot = shieldedVmConfigMap.enableSecureBoot as Boolean
716-
shieldedVmConfig.enableVtpm = shieldedVmConfigMap.enableVtpm as Boolean
717-
shieldedVmConfig.enableIntegrityMonitoring = shieldedVmConfigMap.enableIntegrityMonitoring as Boolean
718-
return shieldedVmConfig
719-
}
711+
// private ShieldedVmConfig convertMapToShieldedVmConfig(Map shieldedVmConfigMap) {
712+
//
713+
// ShieldedVmConfig shieldedVmConfig = new ShieldedVmConfig()
714+
//
715+
// shieldedVmConfig.enableSecureBoot = shieldedVmConfigMap.enableSecureBoot as Boolean
716+
// shieldedVmConfig.enableVtpm = shieldedVmConfigMap.enableVtpm as Boolean
717+
// shieldedVmConfig.enableIntegrityMonitoring = shieldedVmConfigMap.enableIntegrityMonitoring as Boolean
718+
// return shieldedVmConfig
719+
// }
720720

721721
private NetworkInterface convertMapToNetworkInterface(Map networkInterfaceMap) {
722722

‎clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/compute/RegionGoogleServerGroupManagers.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public GoogleComputeOperationRequest patch(InstanceGroupManager content) throws
8787
public GoogleComputeOperationRequest<ComputeRequest<Operation>> update(
8888
InstanceGroupManager content) throws IOException {
8989
return requestFactory.wrapOperationRequest(
90-
managers.update(credentials.getProject(), region, instanceGroupName, content),
90+
managers.patch(credentials.getProject(), region, instanceGroupName, content),
9191
"update",
9292
region);
9393
}

‎clouddriver-google/src/main/java/com/netflix/spinnaker/clouddriver/google/compute/ZoneGoogleServerGroupManagers.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ public GoogleComputeOperationRequest patch(InstanceGroupManager content) throws
8585
public GoogleComputeOperationRequest<ComputeRequest<Operation>> update(
8686
InstanceGroupManager content) throws IOException {
8787
return requestFactory.wrapOperationRequest(
88-
managers.update(credentials.getProject(), zone, instanceGroupName, content),
89-
"update",
90-
zone);
88+
managers.patch(credentials.getProject(), zone, instanceGroupName, content), "update", zone);
9189
}
9290
}

‎clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/CopyLastGoogleServerGroupAtomicOperationUnitSpec.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import com.google.api.services.compute.model.Image
2323
import com.google.api.services.compute.model.InstanceProperties
2424
import com.google.api.services.compute.model.InstanceTemplate
2525
import com.google.api.services.compute.model.Scheduling
26-
import com.google.api.services.compute.model.ShieldedVmConfig
26+
//import com.google.api.services.compute.model.ShieldedVmConfig
2727
import com.netflix.spectator.api.DefaultRegistry
2828
import com.netflix.spinnaker.clouddriver.data.task.Task
2929
import com.netflix.spinnaker.clouddriver.data.task.TaskRepository

‎clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/DeleteGoogleAutoscalingPolicyAtomicOperationUnitSpec.groovy‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package com.netflix.spinnaker.clouddriver.google.deploy.ops
1818

1919
import com.google.api.services.compute.Compute
20-
import com.google.api.services.compute.model.InstanceGroupManagersSetAutoHealingRequest
20+
//import com.google.api.services.compute.model.InstanceGroupManagersSetAutoHealingRequest
2121
import com.google.api.services.compute.model.InstanceTemplate
22-
import com.google.api.services.compute.model.RegionInstanceGroupManagersSetAutoHealingRequest
22+
//import com.google.api.services.compute.model.RegionInstanceGroupManagersSetAutoHealingRequest
2323
import com.netflix.spectator.api.DefaultRegistry
2424
import com.netflix.spinnaker.clouddriver.data.task.Task
2525
import com.netflix.spinnaker.clouddriver.data.task.TaskRepository
@@ -121,7 +121,7 @@ class DeleteGoogleAutoscalingPolicyAtomicOperationUnitSpec extends Specification
121121
def serverGroup = new GoogleServerGroup(zone: ZONE, regional: isRegional).view
122122

123123
// zonal setup
124-
def zonalRequest = new InstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies([])
124+
// def zonalRequest = new InstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies([])
125125
def zonalManagerMock = Mock(Compute.InstanceGroupManagers)
126126
def zonalSetAutoHealingPolicyMock = Mock(Compute.InstanceGroupManagers.SetAutoHealingPolicies)
127127
def zonalTimerId = GoogleApiTestUtils.makeOkId(
@@ -130,15 +130,15 @@ class DeleteGoogleAutoscalingPolicyAtomicOperationUnitSpec extends Specification
130130
[scope: "zonal", zone: ZONE])
131131

132132
// regional setup
133-
def regionalRequest = new RegionInstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies([])
133+
// def regionalRequest = new RegionInstanceGroupManagersSetAutoHealingRequest().setAutoHealingPolicies([])
134134
def regionalManagerMock = Mock(Compute.RegionInstanceGroupManagers)
135135
def regionalSetAutoHealingPolicyMock = Mock(Compute.RegionInstanceGroupManagers.SetAutoHealingPolicies)
136136
def regionalTimerId = GoogleApiTestUtils.makeOkId(
137137
registry,
138138
"compute.regionInstanceGroupManagers.setAutoHealingPolicies",
139139
[scope: "regional", region: REGION])
140140

141-
@Subject def operation = Spy(DeleteGoogleAutoscalingPolicyAtomicOperation, constructorArgs: [description, googleClusterProviderMock, operationPollerMock, atomicOperationsRegistry, orchestrationProcessorMock])
141+
@Subject def operation = Spy(DeleteGoogleAutoscalingPolicyAtomicOperation, constructorArgs: [description, googleClusterProviderMock, operationPollerMock, atomicOperationsRegistry, orchestrationProcessorMock])
142142
operation.registry = registry
143143

144144
when:

‎clouddriver-google/src/test/groovy/com/netflix/spinnaker/clouddriver/google/deploy/ops/SerializeApplicationAtomicOperationUnitSpec.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ class SerializeApplicationAtomicOperationUnitSpec extends Specification {
107107
def scheduling = new Scheduling(automaticRestart: SCHEDULING_AUTOMATIC_RESTART,
108108
onHostMaintenance: SCHEDULING_ON_HOST_MAINTENANCE,
109109
preemptible: SCHEDULING_PREEMPTIBLE)
110-
def shieldedVmConfig = new ShieldedVmConfig(enableSecureBoot: SHIELDEDVMCONFIG_ENABLE_SECURE_BOOT,
111-
enableVtpm: SHIELDEDVMCONFIG_ENABLE_VTPM,
112-
enableIntegrityMonitoring: SHIELDEDVMCONFIG_ENABLE_INTEGRITY_MONITORING)
110+
// def shieldedVmConfig = new ShieldedVmConfig(enableSecureBoot: SHIELDEDVMCONFIG_ENABLE_SECURE_BOOT,
111+
// enableVtpm: SHIELDEDVMCONFIG_ENABLE_VTPM,
112+
// enableIntegrityMonitoring: SHIELDEDVMCONFIG_ENABLE_INTEGRITY_MONITORING)
113113
def disk = new AttachedDisk(autoDelete: DISK_AUTO_DELETE,
114114
boot: DISK_BOOT,
115115
deviceName: DISK_DEVICE_NAME,

0 commit comments

Comments
 (0)