Ensure EndpointSlice exist if Endpoint is unchanged

The EndpointSlice for masters was not created after enabling EndpointSlice feature on a pre-existing cluster. This was because the Endpoint object had been created and ReconcileEndpoints would skip creating or updating it after EndpointSlice feature is enabled. This patch ensures EndpointSlice is consistent with Endpoints after the reconciler reconciles Endpoints even if Endpoints is unchanged. It also avoids an update if the desired EndpointSlice matches the existing one.
2025-12-04 07:05:37 +00:00 · 2019-10-27 08:11:08 -07:00
parent 3d7318f29d
commit 92ceb166e0
5 changed files with 106 additions and 14 deletions
--- a/pkg/master/reconcilers/endpointsadapter_test.go
+++ b/pkg/master/reconcilers/endpointsadapter_test.go
@@ -334,3 +334,81 @@ func generateEndpointsAndSlice(name, namespace string, ports []int, addresses []
 		Subsets:    []corev1.EndpointSubset{subset},
 	}, epSlice
 }
+
+func TestEndpointsAdapterEnsureEndpointSliceFromEndpoints(t *testing.T) {
+	endpoints1, epSlice1 := generateEndpointsAndSlice("foo", "testing", []int{80, 443}, []string{"10.1.2.3", "10.1.2.4"})
+	endpoints2, epSlice2 := generateEndpointsAndSlice("foo", "testing", []int{80, 443}, []string{"10.1.2.3", "10.1.2.4", "10.1.2.5"})
+
+	testCases := map[string]struct {
+		endpointSlicesEnabled bool
+		expectedError         error
+		expectedEndpointSlice *discovery.EndpointSlice
+		endpointSlices        []*discovery.EndpointSlice
+		namespaceParam        string
+		endpointsParam        *corev1.Endpoints
+	}{
+		"existing-endpointslice-no-change": {
+			endpointSlicesEnabled: true,
+			expectedError:         nil,
+			expectedEndpointSlice: epSlice1,
+			endpointSlices:        []*discovery.EndpointSlice{epSlice1},
+			namespaceParam:        "testing",
+			endpointsParam:        endpoints1,
+		},
+		"existing-endpointslice-change": {
+			endpointSlicesEnabled: true,
+			expectedError:         nil,
+			expectedEndpointSlice: epSlice2,
+			endpointSlices:        []*discovery.EndpointSlice{epSlice1},
+			namespaceParam:        "testing",
+			endpointsParam:        endpoints2,
+		},
+		"missing-endpointslice": {
+			endpointSlicesEnabled: true,
+			expectedError:         nil,
+			expectedEndpointSlice: epSlice1,
+			endpointSlices:        []*discovery.EndpointSlice{},
+			namespaceParam:        "testing",
+			endpointsParam:        endpoints1,
+		},
+		"endpointslices-disabled": {
+			endpointSlicesEnabled: false,
+			expectedError:         nil,
+			expectedEndpointSlice: nil,
+			endpointSlices:        []*discovery.EndpointSlice{},
+			namespaceParam:        "testing",
+			endpointsParam:        endpoints1,
+		},
+	}
+
+	for name, testCase := range testCases {
+		t.Run(name, func(t *testing.T) {
+			client := fake.NewSimpleClientset()
+			epAdapter := EndpointsAdapter{endpointClient: client.CoreV1()}
+			if testCase.endpointSlicesEnabled {
+				epAdapter.endpointSliceClient = client.DiscoveryV1alpha1()
+			}
+
+			for _, endpointSlice := range testCase.endpointSlices {
+				_, err := client.DiscoveryV1alpha1().EndpointSlices(endpointSlice.Namespace).Create(endpointSlice)
+				if err != nil {
+					t.Fatalf("Error creating EndpointSlice: %v", err)
+				}
+			}
+
+			err := epAdapter.EnsureEndpointSliceFromEndpoints(testCase.namespaceParam, testCase.endpointsParam)
+			if !apiequality.Semantic.DeepEqual(testCase.expectedError, err) {
+				t.Errorf("Expected error: %v, got: %v", testCase.expectedError, err)
+			}
+
+			endpointSlice, err := client.DiscoveryV1alpha1().EndpointSlices(testCase.namespaceParam).Get(testCase.endpointsParam.Name, metav1.GetOptions{})
+			if err != nil && !errors.IsNotFound(err) {
+				t.Fatalf("Error getting Endpoint Slice: %v", err)
+			}
+
+			if !apiequality.Semantic.DeepEqual(endpointSlice, testCase.expectedEndpointSlice) {
+				t.Errorf("Expected Endpoint Slice: %v, got: %v", testCase.expectedEndpointSlice, endpointSlice)
+			}
+		})
+	}
+}