Skip to content

Commit

Permalink
Merge pull request #1960 from crossplane-contrib/backport-1959-to-rel…
Browse files Browse the repository at this point in the history
…ease-0.45
  • Loading branch information
MisterMX authored Nov 23, 2023
2 parents 4a15e7a + d27a3bd commit 2dfb9a7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
7 changes: 7 additions & 0 deletions pkg/clients/eks/eks.go
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,13 @@ func LateInitialize(in *v1beta1.ClusterParameters, cluster *ekstypes.Cluster) {
in.ResourcesVpcConfig.SubnetIDs = cluster.ResourcesVpcConfig.SubnetIds
}
}
if in.KubernetesNetworkConfig == nil && cluster.KubernetesNetworkConfig != nil {
in.KubernetesNetworkConfig = &v1beta1.KubernetesNetworkConfigRequest{
ServiceIpv4Cidr: pointer.StringValue(cluster.KubernetesNetworkConfig.ServiceIpv4Cidr),
IPFamily: v1beta1.IPFamily(cluster.KubernetesNetworkConfig.IpFamily),
}
}

in.RoleArn = pointer.LateInitializeValueFromPtr(in.RoleArn, cluster.RoleArn)
in.Version = pointer.LateInitialize(in.Version, cluster.Version)
// NOTE(hasheddan): we always will set the default Crossplane tags in
Expand Down
10 changes: 10 additions & 0 deletions pkg/clients/eks/eks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,8 @@ func TestGenerateObservation(t *testing.T) {
}

func TestLateInitialize(t *testing.T) {
ServiceIpv4Cidr := "172.20.0.0/16"
Ipv4Family := "ipv4"
cases := map[string]struct {
parameters *v1beta1.ClusterParameters
cluster *ekstypes.Cluster
Expand Down Expand Up @@ -517,6 +519,10 @@ func TestLateInitialize(t *testing.T) {
SecurityGroupIds: []string{"cool-sg-1"},
SubnetIds: []string{"cool-subnet"},
},
KubernetesNetworkConfig: &ekstypes.KubernetesNetworkConfigResponse{
IpFamily: ekstypes.IpFamily(Ipv4Family),
ServiceIpv4Cidr: &ServiceIpv4Cidr,
},
RoleArn: &roleArn,
Tags: map[string]string{"key": "val"},
Version: &version,
Expand Down Expand Up @@ -547,6 +553,10 @@ func TestLateInitialize(t *testing.T) {
SecurityGroupIDs: []string{"cool-sg-1"},
SubnetIDs: []string{"cool-subnet"},
},
KubernetesNetworkConfig: &v1beta1.KubernetesNetworkConfigRequest{
ServiceIpv4Cidr: ServiceIpv4Cidr,
IPFamily: v1beta1.IPFamily(Ipv4Family),
},
RoleArn: roleArn,
Tags: map[string]string{"key": "val"},
Version: &version,
Expand Down

0 comments on commit 2dfb9a7

Please sign in to comment.