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.

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

feat(aws): Improving AWS EC2 instance types API integration and caching, feat(aws): Adding archi type to images API and caching #5609

Merged
merged 4 commits into from
Aug 24, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,54 @@
* limitations under the License.
*/



package com.netflix.spinnaker.clouddriver.aws.model
import com.netflix.spinnaker.clouddriver.model.InstanceType
import groovy.transform.Canonical

@Canonical
class AmazonInstanceType implements InstanceType {
String account
String region
String name
String account
String region
String name
Integer defaultVCpus
Long memoryInGiB
String hypervisor
AmazonInstanceStorageInfo instanceStorageInfo
AmazonInstanceEbsInfo ebsInfo
AmazonInstanceGpuInfo gpuInfo

Boolean instanceStorageSupported
Boolean currentGeneration
Boolean bareMetal
Boolean ipv6Supported
Boolean burstablePerformanceSupported

List<String> supportedArchitectures
List<String> supportedUsageClasses
List<String> supportedRootDeviceTypes
List<String> supportedVirtualizationTypes
}

class AmazonInstanceStorageInfo {
String storageTypes
Long totalSizeInGB
String nvmeSupport
}

class AmazonInstanceEbsInfo {
String ebsOptimizedSupport
String nvmeSupport
String encryptionSupport
}

class AmazonInstanceGpuInfo {
Integer totalGpuMemoryInMiB
List<AmazonInstanceGpuDeviceInfo> gpus
}

class AmazonInstanceGpuDeviceInfo {
String name
String manufacturer
Integer count
Integer gpuSizeInMiB
}
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ class ImageCachingAgent implements CachingAgent, AccountAware, DriftMetric, Cust
namedImageCacheDataMap.put(namedImageId, new DefaultCacheData(namedImageId, [
name : image.name,
virtualizationType: image.virtualizationType,
architecture : image.architecture,
dbyron-sf marked this conversation as resolved.
Show resolved Hide resolved
creationDate : image.creationDate
], [(IMAGES.ns): [imageId]]))
} else {
Expand Down
Loading