Skip to content

Commit dc2c50a

Browse files
nikimanoledakinikimanoledaki
committed
Commenting ipFamily test and code due to CF bug
- Revert me!
1 parent bd5e532 commit dc2c50a

3 files changed

Lines changed: 49 additions & 46 deletions

File tree

‎integration/tests/ipv6/ipv6_test.go‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package ipv6
55

66
import (
77
"bytes"
8-
"context"
98
"encoding/json"
109
"fmt"
1110
"strings"
@@ -19,15 +18,10 @@ import (
1918
"github.com/weaveworks/eksctl/integration/tests"
2019
api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
2120
"github.com/weaveworks/eksctl/pkg/cfn/builder"
22-
"github.com/weaveworks/eksctl/pkg/eks"
2321
"github.com/weaveworks/eksctl/pkg/testutils"
24-
corev1 "k8s.io/api/core/v1"
25-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
26-
"k8s.io/client-go/kubernetes"
2722

2823
. "github.com/onsi/ginkgo"
2924
. "github.com/onsi/gomega"
30-
"github.com/xgfone/netaddr"
3125
)
3226

3327
var params *tests.Params
@@ -135,35 +129,36 @@ var _ = Describe("(Integration) [EKS IPv6 test]", func() {
135129
Expect(*s.AssignIpv6AddressOnCreation).To(BeTrue())
136130
}
137131

138-
By("the k8s cluster's having an IP family of IPv6")
139-
var clientSet *kubernetes.Clientset
140-
ctl, err := eks.New(&api.ProviderConfig{Region: params.Region}, clusterConfig)
141-
Expect(err).NotTo(HaveOccurred())
142-
err = ctl.RefreshClusterStatus(clusterConfig)
143-
Expect(err).ShouldNot(HaveOccurred())
144-
clientSet, err = ctl.NewStdClientSet(clusterConfig)
145-
Expect(err).ShouldNot(HaveOccurred())
146-
147-
svcName := "IPv6Service"
148-
_, err = clientSet.CoreV1().Services("default").Create(context.TODO(), &corev1.Service{
149-
ObjectMeta: metav1.ObjectMeta{
150-
Name: svcName,
151-
},
152-
Spec: corev1.ServiceSpec{
153-
IPFamilies: []corev1.IPFamily{corev1.IPv6Protocol},
154-
Selector: map[string]string{"app": "IPv6App"},
155-
Ports: []corev1.ServicePort{corev1.ServicePort{
156-
Protocol: corev1.ProtocolTCP,
157-
Port: 80,
158-
}},
159-
},
160-
}, metav1.CreateOptions{})
161-
Expect(err).ShouldNot(HaveOccurred())
162-
163-
svc, err := clientSet.CoreV1().Services("default").Get(context.TODO(), svcName, metav1.GetOptions{})
164-
svcIP, err := netaddr.NewIPAddress(svc.Spec.ClusterIP)
165-
Expect(err).NotTo(HaveOccurred())
166-
Expect(svcIP.Version()).To(Equal(6))
132+
// TODO: Uncomment and run the following test once CF handler bug is fixed from EKS side.
133+
// By("the k8s cluster's having an IP family of IPv6")
134+
// var clientSet *kubernetes.Clientset
135+
// ctl, err := eks.New(&api.ProviderConfig{Region: params.Region}, clusterConfig)
136+
// Expect(err).NotTo(HaveOccurred())
137+
// err = ctl.RefreshClusterStatus(clusterConfig)
138+
// Expect(err).ShouldNot(HaveOccurred())
139+
// clientSet, err = ctl.NewStdClientSet(clusterConfig)
140+
// Expect(err).ShouldNot(HaveOccurred())
141+
142+
// svcName := "IPv6Service"
143+
// _, err = clientSet.CoreV1().Services("default").Create(context.TODO(), &corev1.Service{
144+
// ObjectMeta: metav1.ObjectMeta{
145+
// Name: svcName,
146+
// },
147+
// Spec: corev1.ServiceSpec{
148+
// IPFamilies: []corev1.IPFamily{corev1.IPv6Protocol},
149+
// Selector: map[string]string{"app": "IPv6App"},
150+
// Ports: []corev1.ServicePort{corev1.ServicePort{
151+
// Protocol: corev1.ProtocolTCP,
152+
// Port: 80,
153+
// }},
154+
// },
155+
// }, metav1.CreateOptions{})
156+
// Expect(err).ShouldNot(HaveOccurred())
157+
158+
// svc, err := clientSet.CoreV1().Services("default").Get(context.TODO(), svcName, metav1.GetOptions{})
159+
// svcIP, err := netaddr.NewIPAddress(svc.Spec.ClusterIP)
160+
// Expect(err).NotTo(HaveOccurred())
161+
// Expect(svcIP.Version()).To(Equal(6))
167162
})
168163
})
169164
})

‎pkg/cfn/builder/cluster.go‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package builder
33
import (
44
"encoding/base64"
55
"fmt"
6-
"strings"
76

87
"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
98

@@ -170,17 +169,24 @@ func (c *ClusterResourceSet) addResourcesForControlPlane(subnetDetails *SubnetDe
170169
EncryptionConfig: encryptionConfigs,
171170
}
172171

173-
cluster.KubernetesNetworkConfig = &gfneks.Cluster_KubernetesNetworkConfig{
174-
IpFamily: gfnt.NewString(strings.ToLower(string(api.IPV4Family))),
172+
//TODO: delete this below If statement, and uncomment the code below once we can create ipv6 clusters
173+
if c.spec.KubernetesNetworkConfig != nil && c.spec.KubernetesNetworkConfig.ServiceIPv4CIDR != "" {
174+
cluster.KubernetesNetworkConfig = &gfneks.Cluster_KubernetesNetworkConfig{
175+
ServiceIpv4Cidr: gfnt.NewString(c.spec.KubernetesNetworkConfig.ServiceIPv4CIDR),
176+
}
175177
}
176178

177-
if c.spec.VPC.IPFamily != nil && *c.spec.VPC.IPFamily == string(api.IPV6Family) {
178-
cluster.KubernetesNetworkConfig.IpFamily = gfnt.NewString(strings.ToLower(string(api.IPV6Family)))
179-
}
179+
// cluster.KubernetesNetworkConfig = &gfneks.Cluster_KubernetesNetworkConfig{
180+
// IpFamily: gfnt.NewString(strings.ToLower(string(api.IPV4Family))),
181+
// }
180182

181-
if c.spec.KubernetesNetworkConfig != nil && c.spec.KubernetesNetworkConfig.ServiceIPv4CIDR != "" {
182-
cluster.KubernetesNetworkConfig.ServiceIpv4Cidr = gfnt.NewString(c.spec.KubernetesNetworkConfig.ServiceIPv4CIDR)
183-
}
183+
// if c.spec.VPC.IPFamily != nil && *c.spec.VPC.IPFamily == string(api.IPV6Family) {
184+
// cluster.KubernetesNetworkConfig.IpFamily = gfnt.NewString(strings.ToLower(string(api.IPV6Family)))
185+
// }
186+
187+
// if c.spec.KubernetesNetworkConfig != nil && c.spec.KubernetesNetworkConfig.ServiceIPv4CIDR != "" {
188+
// cluster.KubernetesNetworkConfig.ServiceIpv4Cidr = gfnt.NewString(c.spec.KubernetesNetworkConfig.ServiceIPv4CIDR)
189+
// }
184190

185191
c.newResource("ControlPlane", &cluster)
186192

‎pkg/cfn/builder/cluster_test.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ var _ = Describe("Cluster Template Builder", func() {
7474
Expect(clusterTemplate.Resources["ControlPlane"].Properties.RoleArn).To(ContainElement([]interface{}{"ServiceRole", "Arn"}))
7575
Expect(clusterTemplate.Resources["ControlPlane"].Properties.EncryptionConfig).To(BeNil())
7676
Expect(clusterTemplate.Resources["ControlPlane"].Properties.KubernetesNetworkConfig.ServiceIPv4CIDR).To(Equal("131.10.55.70/18"))
77-
Expect(clusterTemplate.Resources["ControlPlane"].Properties.KubernetesNetworkConfig.IPFamily).To(Equal("ipv4"))
77+
// TODO uncomment once CF handler bug is fixed
78+
// Expect(clusterTemplate.Resources["ControlPlane"].Properties.KubernetesNetworkConfig.IPFamily).To(Equal("ipv4"))
7879
})
7980

8081
It("should add vpc resources", func() {
@@ -102,7 +103,8 @@ var _ = Describe("Cluster Template Builder", func() {
102103
cfg.VPC.IPFamily = aws.String(string(api.IPV6Family))
103104
})
104105

105-
It("should add control plane resources", func() {
106+
// TODO: Unpend once CF handler bug is fixed on EKS side.
107+
PIt("should add control plane resources", func() {
106108
Expect(clusterTemplate.Resources["ControlPlane"].Properties.KubernetesNetworkConfig.IPFamily).To(Equal("ipv6"))
107109
})
108110

0 commit comments

Comments
 (0)