From cf632227cf41f791bec0e2580005c9e09639bced Mon Sep 17 00:00:00 2001 From: Erikson Tung Date: Tue, 19 Sep 2023 11:55:58 -0700 Subject: [PATCH] karpenter-ec2: take cluster sg as a single string instead of sequence The cluster security group is a singular value we pass from the EKS resource agent to the EC2 karpenter agent config. --- .../bin/ec2-karpenter-resource-agent/ec2_karpenter_provider.rs | 2 +- bottlerocket/types/src/agent_config.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bottlerocket/agents/src/bin/ec2-karpenter-resource-agent/ec2_karpenter_provider.rs b/bottlerocket/agents/src/bin/ec2-karpenter-resource-agent/ec2_karpenter_provider.rs index eba5a91e..39044874 100644 --- a/bottlerocket/agents/src/bin/ec2-karpenter-resource-agent/ec2_karpenter_provider.rs +++ b/bottlerocket/agents/src/bin/ec2-karpenter-resource-agent/ec2_karpenter_provider.rs @@ -261,7 +261,7 @@ impl Create for Ec2KarpenterCreator { .value(&spec.configuration.cluster_name) .build(), ) - .set_resources(Some(spec.configuration.cluster_sg.clone())) + .set_resources(Some(vec![spec.configuration.cluster_sg.clone()])) .send() .await .context(resources, "Unable to tag cluster's security groups")?; diff --git a/bottlerocket/types/src/agent_config.rs b/bottlerocket/types/src/agent_config.rs index 45ac72d8..fc6e9142 100644 --- a/bottlerocket/types/src/agent_config.rs +++ b/bottlerocket/types/src/agent_config.rs @@ -325,7 +325,7 @@ pub struct Ec2KarpenterConfig { pub endpoint: String, /// The cluster security group - pub cluster_sg: Vec, + pub cluster_sg: String, /// The device mappings used for karpenter provisioning #[serde(default)]