Skip to content

Commit 8528bfc

Browse files
authored
Add Azure VM and AKS integration tests for the default OTel config (#730)
1 parent 5523271 commit 8528bfc

15 files changed

Lines changed: 1566 additions & 5 deletions

File tree

environment/computetype/compute_type.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,20 @@ const (
1111
EC2 ComputeType = "EC2"
1212
ECS ComputeType = "ECS"
1313
EKS ComputeType = "EKS"
14+
// AzureVM is a non-AWS host authenticating to AWS via the Azure web-identity credential chain.
15+
AzureVM ComputeType = "AZUREVM"
16+
// AKS is an Azure Kubernetes Service cluster authenticating to AWS via the projected
17+
// service-account web-identity credential chain.
18+
AKS ComputeType = "AKS"
1419
)
1520

1621
var (
1722
computeTypes = map[string]ComputeType{
18-
"EC2": EC2,
19-
"ECS": ECS,
20-
"EKS": EKS,
23+
"EC2": EC2,
24+
"ECS": ECS,
25+
"EKS": EKS,
26+
"AZUREVM": AzureVM,
27+
"AKS": AKS,
2128
}
2229
)
2330

environment/metadata.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ type MetaData struct {
3939
CwaCommitSha string
4040
CaCertPath string
4141
EKSClusterName string
42+
AKSClusterName string
4243
ProxyUrl string
4344
AssumeRoleArn string
4445
InstanceArn string
@@ -86,6 +87,7 @@ type MetaDataStrings struct {
8687
CwaCommitSha string
8788
CaCertPath string
8889
EKSClusterName string
90+
AKSClusterName string
8991
ProxyUrl string
9092
AssumeRoleArn string
9193
InstanceArn string
@@ -119,7 +121,7 @@ type MetaDataStrings struct {
119121
}
120122

121123
func registerComputeType(dataString *MetaDataStrings) {
122-
flag.StringVar(&(dataString.ComputeType), "computeType", "", "EC2/ECS/EKS")
124+
flag.StringVar(&(dataString.ComputeType), "computeType", "", "EC2/ECS/EKS/AZUREVM/AKS")
123125
}
124126
func registerBucket(dataString *MetaDataStrings) {
125127
flag.StringVar(&(dataString.Bucket), "bucket", "", "s3 bucket ex cloudwatch-agent-integration-bucket")
@@ -142,6 +144,10 @@ func registerECSData(dataString *MetaDataStrings) {
142144
flag.StringVar(&(dataString.EcsServiceName), "cwagentECSServiceName", "", "Used to restart ecs task to apply new agent config")
143145
}
144146

147+
func registerAKSData(d *MetaDataStrings) {
148+
flag.StringVar(&(d.AKSClusterName), "aksClusterName", "", "AKS cluster name")
149+
}
150+
145151
func registerEKSData(d *MetaDataStrings) {
146152
flag.StringVar(&(d.EKSClusterName), "eksClusterName", "", "EKS cluster name")
147153
flag.StringVar(&(d.EksDeploymentStrategy), "eksDeploymentStrategy", "", "Daemon/Replica/Sidecar")
@@ -187,7 +193,7 @@ func registerProxyUrl(dataString *MetaDataStrings) {
187193
func fillComputeType(e *MetaData, data *MetaDataStrings) {
188194
computeType, ok := computetype.FromString(data.ComputeType)
189195
if !ok {
190-
log.Panic("Invalid compute type. Needs to be EC2/ECS/EKS. Compute Type is a required flag. :" + data.ComputeType)
196+
log.Panic("Invalid compute type. Needs to be EC2/ECS/EKS/AZUREVM/AKS. Compute Type is a required flag. :" + data.ComputeType)
191197
}
192198
e.ComputeType = computeType
193199
}
@@ -321,6 +327,7 @@ func RegisterEnvironmentMetaDataFlags() *MetaDataStrings {
321327
registerComputeType(registeredMetaDataStrings)
322328
registerECSData(registeredMetaDataStrings)
323329
registerEKSData(registeredMetaDataStrings)
330+
registerAKSData(registeredMetaDataStrings)
324331
registerEKSE2ETestData(registeredMetaDataStrings)
325332
registerBucket(registeredMetaDataStrings)
326333
registerS3Key(registeredMetaDataStrings)
@@ -359,6 +366,7 @@ func GetEnvironmentMetaData() *MetaData {
359366
metaDataStorage.AssumeRoleArn = registeredMetaDataStrings.AssumeRoleArn
360367
metaDataStorage.InstanceArn = registeredMetaDataStrings.InstanceArn
361368
metaDataStorage.InstanceId = registeredMetaDataStrings.InstanceId
369+
metaDataStorage.AKSClusterName = registeredMetaDataStrings.AKSClusterName
362370
metaDataStorage.InstancePlatform = registeredMetaDataStrings.InstancePlatform
363371
metaDataStorage.AgentStartCommand = registeredMetaDataStrings.AgentStartCommand
364372
metaDataStorage.EksGpuType = registeredMetaDataStrings.EksGpuType

terraform/azure/aks/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
kubeconfig

0 commit comments

Comments
 (0)