Skip to content

Commit

Permalink
Remove invalid usage of v1alpha2.ExternalIPPool in e2e tests
Browse files Browse the repository at this point in the history
It should have been v1beta1

Signed-off-by: Antonin Bas <antonin.bas@broadcom.com>
  • Loading branch information
antoninbas committed Apr 18, 2024
1 parent 9973ca8 commit afbd55b
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions test/e2e/service_externalip_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ func testServiceExternalTrafficPolicyLocal(t *testing.T, data *TestData) {
var service *v1.Service
var eps *v1.Endpoints
ipPool := data.createExternalIPPool(t, "test-service-pool-", tt.ipRange, nil, tt.nodeSelector.MatchExpressions, tt.nodeSelector.MatchLabels)
defer data.crdClient.CrdV1alpha2().ExternalIPPools().Delete(context.TODO(), ipPool.Name, metav1.DeleteOptions{})
defer data.crdClient.CrdV1beta1().ExternalIPPools().Delete(context.TODO(), ipPool.Name, metav1.DeleteOptions{})

annotation := map[string]string{
antreaagenttypes.ServiceExternalIPPoolAnnotationKey: ipPool.Name,
Expand Down Expand Up @@ -324,7 +324,7 @@ func testServiceWithExternalIPCRUD(t *testing.T, data *TestData) {
var err error
var service *v1.Service
ipPool := data.createExternalIPPool(t, "crud-pool-", tt.ipRange, nil, tt.nodeSelector.MatchExpressions, tt.nodeSelector.MatchLabels)
defer data.crdClient.CrdV1alpha2().ExternalIPPools().Delete(context.TODO(), ipPool.Name, metav1.DeleteOptions{})
defer data.crdClient.CrdV1beta1().ExternalIPPools().Delete(context.TODO(), ipPool.Name, metav1.DeleteOptions{})

annotation := map[string]string{
antreaagenttypes.ServiceExternalIPPoolAnnotationKey: ipPool.Name,
Expand All @@ -345,7 +345,7 @@ func testServiceWithExternalIPCRUD(t *testing.T, data *TestData) {
var gotUsed, gotTotal int
err := wait.PollUntilContextTimeout(context.Background(), 200*time.Millisecond, 2*time.Second, true,
func(ctx context.Context) (done bool, err error) {
pool, err := data.crdClient.CrdV1alpha2().ExternalIPPools().Get(context.TODO(), ipPool.Name, metav1.GetOptions{})
pool, err := data.crdClient.CrdV1beta1().ExternalIPPools().Get(context.TODO(), ipPool.Name, metav1.GetOptions{})
if err != nil {
return false, fmt.Errorf("failed to get ExternalIPPool: %v", err)
}
Expand Down Expand Up @@ -415,9 +415,9 @@ func testServiceUpdateExternalIP(t *testing.T, data *TestData) {
}

originalPool := data.createExternalIPPool(t, "originalpool-", tt.originalIPRange, nil, nil, map[string]string{v1.LabelHostname: tt.originalNode})
defer data.crdClient.CrdV1alpha2().ExternalIPPools().Delete(context.TODO(), originalPool.Name, metav1.DeleteOptions{})
defer data.crdClient.CrdV1beta1().ExternalIPPools().Delete(context.TODO(), originalPool.Name, metav1.DeleteOptions{})
newPool := data.createExternalIPPool(t, "newpool-", tt.newIPRange, nil, nil, map[string]string{v1.LabelHostname: tt.newNode})
defer data.crdClient.CrdV1alpha2().ExternalIPPools().Delete(context.TODO(), newPool.Name, metav1.DeleteOptions{})
defer data.crdClient.CrdV1beta1().ExternalIPPools().Delete(context.TODO(), newPool.Name, metav1.DeleteOptions{})

annotation := map[string]string{
antreaagenttypes.ServiceExternalIPPoolAnnotationKey: originalPool.Name,
Expand Down Expand Up @@ -500,7 +500,7 @@ func testServiceNodeFailure(t *testing.T, data *TestData) {
},
}
externalIPPoolTwoNodes := data.createExternalIPPool(t, "pool-with-two-nodes-", tt.ipRange, nil, matchExpressions, nil)
defer data.crdClient.CrdV1alpha2().ExternalIPPools().Delete(context.TODO(), externalIPPoolTwoNodes.Name, metav1.DeleteOptions{})
defer data.crdClient.CrdV1beta1().ExternalIPPools().Delete(context.TODO(), externalIPPoolTwoNodes.Name, metav1.DeleteOptions{})
annotation := map[string]string{
antreaagenttypes.ServiceExternalIPPoolAnnotationKey: externalIPPoolTwoNodes.Name,
}
Expand Down Expand Up @@ -574,7 +574,7 @@ func testExternalIPAccess(t *testing.T, data *TestData) {
nodes := []string{nodeName(0), nodeName(1)}
ipRange := v1beta1.IPRange{CIDR: tt.externalIPCIDR}
ipPool := data.createExternalIPPool(t, "ippool-", ipRange, nil, nil, nil)
defer data.crdClient.CrdV1alpha2().ExternalIPPools().Delete(context.TODO(), ipPool.Name, metav1.DeleteOptions{})
defer data.crdClient.CrdV1beta1().ExternalIPPools().Delete(context.TODO(), ipPool.Name, metav1.DeleteOptions{})
agnhosts := []string{"agnhost-0", "agnhost-1"}
// Create agnhost Pods on each Node.
for idx, node := range nodes {
Expand Down

0 comments on commit afbd55b

Please sign in to comment.