From 90ff2031b533a662cdc99ea711bb0c9401ae3d0f Mon Sep 17 00:00:00 2001 From: Tibi <110664232+TiberiuGC@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:41:15 +0200 Subject: [PATCH] [Hybrid Nodes] Make `remoteNetworkConfig.IAM.Provider` field case insensitive (#8169) make RemoteNetworkConfig.IAM.Provider case insensitive --- examples/43-hybrid-nodes.yaml | 18 +++++------------- pkg/cfn/builder/cluster.go | 2 +- pkg/cfn/builder/iam.go | 3 ++- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/examples/43-hybrid-nodes.yaml b/examples/43-hybrid-nodes.yaml index fc5afcfbdc..902ade3f95 100644 --- a/examples/43-hybrid-nodes.yaml +++ b/examples/43-hybrid-nodes.yaml @@ -1,23 +1,15 @@ -# An example of cluster config with remote networking configured. apiVersion: eksctl.io/v1alpha5 kind: ClusterConfig metadata: - name: hybrid-nodes + name: hybrid-2 region: us-west-2 - -accessConfig: - authenticationMode: API_AND_CONFIG_MAP - -vpc: - cidr: 10.226.98.0/23 + version: "1.31" remoteNetworkConfig: - vpcGatewayID: tgw-028fbe2348e6eed74 iam: - provider: IRA # default is ssm - caBundleCert: xxxx + provider: SSM + # caBundleCert: ceva + # vpcGatewayID: tgw-028fbe2348e6eed74 remoteNodeNetworks: - # eksctl will create, behind the scenes, SG rules, routes, and a VPC gateway attachment, - # to facilitate communication between remote network(s) and EKS control plane, via the attached gateway - cidrs: ["10.80.146.0/24"] diff --git a/pkg/cfn/builder/cluster.go b/pkg/cfn/builder/cluster.go index 601ddb1aca..49cf89a862 100644 --- a/pkg/cfn/builder/cluster.go +++ b/pkg/cfn/builder/cluster.go @@ -445,7 +445,7 @@ func (c *ClusterResourceSet) addResourcesForControlPlane(subnetDetails *SubnetDe func (c *ClusterResourceSet) addAccessEntryForRemoteNodes() { getRemoteNodesRoleName := func() string { - switch *c.spec.RemoteNetworkConfig.IAM.Provider { + switch strings.ToLower(*c.spec.RemoteNetworkConfig.IAM.Provider) { case api.SSMProvider: return SSMRole case api.IRAProvider: diff --git a/pkg/cfn/builder/iam.go b/pkg/cfn/builder/iam.go index 7f9df48a3a..1dd97a4a81 100644 --- a/pkg/cfn/builder/iam.go +++ b/pkg/cfn/builder/iam.go @@ -3,6 +3,7 @@ package builder import ( "context" "fmt" + "strings" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" @@ -221,7 +222,7 @@ func (c *ClusterResourceSet) addSSM() { func (c *ClusterResourceSet) addResourcesForRemoteNodesRole() { c.rs.withIAM = true - switch *c.spec.RemoteNetworkConfig.IAM.Provider { + switch strings.ToLower(*c.spec.RemoteNetworkConfig.IAM.Provider) { case api.SSMProvider: c.addSSM() case api.IRAProvider: