build(deps): bump the k8s-dependencies group with 4 updates

apis/projectcontour/v1alpha1/contourconfig.go

@@ -86,10 +86,6 @@ type ContourConfigurationSpec struct {
 	Tracing *TracingConfig `json:"tracing,omitempty"`
 
 	// FeatureFlags defines toggle to enable new contour features.
-	// Available toggles are:
-	// useEndpointSlices - Configures contour to fetch endpoint data
-	// from k8s endpoint slices. defaults to true,
-	// If false then reads endpoint data from the k8s endpoints.
 	FeatureFlags FeatureFlags `json:"featureFlags,omitempty"`
 }
 

apis/projectcontour/v1alpha1/contourconfig_helpers.go

@@ -21,11 +21,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
-const featureFlagUseEndpointSlices string = "useEndpointSlices"
-
-var featureFlagsMap = map[string]struct{}{
-	featureFlagUseEndpointSlices: {},
-}
+var featureFlagsMap = map[string]struct{}{}
 
 // Validate configuration that is not already covered by CRD validation.
 func (c *ContourConfigurationSpec) Validate() error {
@@ -235,26 +231,12 @@ func (f FeatureFlags) Validate() error {
 	for _, featureFlag := range f {
 		fields := strings.Split(featureFlag, "=")
 		if _, found := featureFlagsMap[fields[0]]; !found {
-			return fmt.Errorf("invalid contour configuration, unknown feature flag:%s", featureFlag)
+			return fmt.Errorf("invalid contour configuration, unknown feature flag: %s", featureFlag)
 		}
 	}
 	return nil
 }
 
-func (f FeatureFlags) IsEndpointSliceEnabled() bool {
-	// only when the flag: 'useEndpointSlices=false' is exists, return false
-	for _, flag := range f {
-		if !strings.HasPrefix(flag, featureFlagUseEndpointSlices) {
-			continue
-		}
-		fields := strings.Split(flag, "=")
-		if len(fields) == 2 && strings.ToLower(fields[1]) == "false" {
-			return false
-		}
-	}
-	return true
-}
-
 // Validate ensures that GatewayRef namespace/name is specified.
 func (g *GatewayConfig) Validate() error {
 	if g != nil && (g.GatewayRef.Namespace == "" || g.GatewayRef.Name == "") {

apis/projectcontour/v1alpha1/contourconfig_helpers_test.go

@@ -303,36 +303,10 @@ func TestFeatureFlagsValidate(t *testing.T) {
 		flags    contour_v1alpha1.FeatureFlags
 		expected error
 	}{
-		{
-			name:     "valid flag: no value",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices"},
-			expected: nil,
-		},
-		{
-			name:     "valid flag2: empty",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices="},
-			expected: nil,
-		},
-		{
-			name:     "valid flag: true",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices=true"},
-			expected: nil,
-		},
-		{
-			name:     "valid flag: false",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices=false"},
-			expected: nil,
-		},
-
 		{
 			name:     "invalid flag",
 			flags:    contour_v1alpha1.FeatureFlags{"invalidFlag"},
-			expected: fmt.Errorf("invalid contour configuration, unknown feature flag:invalidFlag"),
-		},
-		{
-			name:     "mix of valid and invalid flags",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices", "invalidFlag"},
-			expected: fmt.Errorf("invalid contour configuration, unknown feature flag:invalidFlag"),
+			expected: fmt.Errorf("invalid contour configuration, unknown feature flag: invalidFlag"),
 		},
 		{
 			name:     "empty flags",
@@ -348,68 +322,3 @@ func TestFeatureFlagsValidate(t *testing.T) {
 		})
 	}
 }
-
-func TestFeatureFlagsIsEndpointSliceEnabled(t *testing.T) {
-	tests := []struct {
-		name     string
-		flags    contour_v1alpha1.FeatureFlags
-		expected bool
-	}{
-		{
-			name:     "valid flag: no value",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices"},
-			expected: true,
-		},
-		{
-			name:     "valid flag2: empty",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices="},
-			expected: true,
-		},
-		{
-			name:     "valid flag: true",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices=true"},
-			expected: true,
-		},
-		{
-			name:     "valid flag: ANY",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices=ANY"},
-			expected: true,
-		},
-
-		{
-			name:     "empty flags",
-			flags:    contour_v1alpha1.FeatureFlags{},
-			expected: true,
-		},
-		{
-			name:     "empty string",
-			flags:    contour_v1alpha1.FeatureFlags{""},
-			expected: true,
-		},
-
-		{
-			name:     "multi-flags",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices", "otherFlag"},
-			expected: true,
-		},
-
-		{
-			name:     "valid flag: false",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices=false"},
-			expected: false,
-		},
-
-		{
-			name:     "valid flag: FALSE",
-			flags:    contour_v1alpha1.FeatureFlags{"useEndpointSlices=FALSE"},
-			expected: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := tt.flags.IsEndpointSliceEnabled()
-			assert.Equal(t, tt.expected, err)
-		})
-	}
-}

changelogs/unreleased/7008-sunjayBhatia-deprecation.md

@@ -0,0 +1,5 @@
+## useEndpointSlices feature flag removed
+
+As of v1.29.0, Contour has used the Kubernetes EndpointSlices API by default to determine the endpoints to configure Envoy with, instead of the Endpoints API.
+EndpointSlice support is now stable and the remaining Endpoint handling code, along with the associated `useEndpointSlices` feature flag, has been removed.
+This should be a no-op change for most users, only affecting those that opted into continuing to use the Endpoints API and possibly also disabled EndpointSlice mirroring of Endpoints.

cmd/contour/serve.go

@@ -192,12 +192,6 @@
 	handlerCacheSyncs []cache.InformerSynced
 }
 
-type EndpointsTranslator interface {
-	cache.ResourceEventHandler
-	xdscache.ResourceCache
-	SetObserver(observer contour.Observer)
-}
-
 // NewServer returns a Server object which contains the initial configuration
 // objects required to start an instance of Contour.
 func NewServer(log logrus.FieldLogger, ctx *serveContext) (*Server, error) {
@@ -488,13 +482,8 @@
 
 	contourMetrics := metrics.NewMetrics(s.registry)
 
-	// Endpoints updates are handled directly by the EndpointsTranslator/EndpointSliceTranslator due to the high update volume.
-	var endpointHandler EndpointsTranslator
-	if contourConfiguration.FeatureFlags.IsEndpointSliceEnabled() {
-		endpointHandler = xdscache_v3.NewEndpointSliceTranslator(s.log.WithField("context", "endpointslicetranslator"))
-	} else {
-		endpointHandler = xdscache_v3.NewEndpointsTranslator(s.log.WithField("context", "endpointstranslator"))
-	}
+	// Endpoints updates are handled directly by the EndpointSliceTranslator due to the high update volume.
+	endpointHandler := xdscache_v3.NewEndpointSliceTranslator(s.log.WithField("context", "endpointslicetranslator"))
 
 	envoyGen := envoy_v3.NewEnvoyGen(envoy_v3.EnvoyGenOpt{
 		XDSClusterName: envoy_v3.DefaultXDSClusterName,
@@ -655,21 +644,12 @@
 		s.log.WithError(err).WithField("resource", "secrets").Fatal("failed to create informer")
 	}
 
-	// Inform on endpoints/endpointSlices.
-	if contourConfiguration.FeatureFlags.IsEndpointSliceEnabled() {
-		if err := s.informOnResource(&discovery_v1.EndpointSlice{}, &contour.EventRecorder{
-			Next:    endpointHandler,
-			Counter: contourMetrics.EventHandlerOperations,
-		}); err != nil {
-			s.log.WithError(err).WithField("resource", "endpointslices").Fatal("failed to create informer")
-		}
-	} else {
-		if err := s.informOnResource(&core_v1.Endpoints{}, &contour.EventRecorder{
-			Next:    endpointHandler,
-			Counter: contourMetrics.EventHandlerOperations,
-		}); err != nil {
-			s.log.WithError(err).WithField("resource", "endpoints").Fatal("failed to create informer")
-		}
+	// Inform on endpointSlices.
+	if err := s.informOnResource(&discovery_v1.EndpointSlice{}, &contour.EventRecorder{
+		Next:    endpointHandler,
+		Counter: contourMetrics.EventHandlerOperations,
+	}); err != nil {
+		s.log.WithError(err).WithField("resource", "endpointslices").Fatal("failed to create informer")
 	}
 
 	// Register our event handler with the manager.

examples/contour/01-crds.yaml

@@ -630,12 +630,7 @@ spec:
                     type: object
                 type: object
               featureFlags:
-                description: |-
-                  FeatureFlags defines toggle to enable new contour features.
-                  Available toggles are:
-                  useEndpointSlices - Configures contour to fetch endpoint data
-                  from k8s endpoint slices. defaults to true,
-                  If false then reads endpoint data from the k8s endpoints.
+                description: FeatureFlags defines toggle to enable new contour features.
                 items:
                   type: string
                 type: array
@@ -2801,7 +2796,7 @@ spec:
                             The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                             The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
                             The volume will be mounted read-only (ro) and non-executable files (noexec).
-                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
+                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                             The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                           properties:
                             pullPolicy:
@@ -4473,12 +4468,8 @@ spec:
                         type: object
                     type: object
                   featureFlags:
-                    description: |-
-                      FeatureFlags defines toggle to enable new contour features.
-                      Available toggles are:
-                      useEndpointSlices - Configures contour to fetch endpoint data
-                      from k8s endpoint slices. defaults to true,
-                      If false then reads endpoint data from the k8s endpoints.
+                    description: FeatureFlags defines toggle to enable new contour
+                      features.
                     items:
                       type: string
                     type: array

examples/render/contour-deployment.yaml

@@ -845,12 +845,7 @@ spec:
                     type: object
                 type: object
               featureFlags:
-                description: |-
-                  FeatureFlags defines toggle to enable new contour features.
-                  Available toggles are:
-                  useEndpointSlices - Configures contour to fetch endpoint data
-                  from k8s endpoint slices. defaults to true,
-                  If false then reads endpoint data from the k8s endpoints.
+                description: FeatureFlags defines toggle to enable new contour features.
                 items:
                   type: string
                 type: array
@@ -3016,7 +3011,7 @@ spec:
                             The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                             The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
                             The volume will be mounted read-only (ro) and non-executable files (noexec).
-                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
+                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                             The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                           properties:
                             pullPolicy:
@@ -4688,12 +4683,8 @@ spec:
                         type: object
                     type: object
                   featureFlags:
-                    description: |-
-                      FeatureFlags defines toggle to enable new contour features.
-                      Available toggles are:
-                      useEndpointSlices - Configures contour to fetch endpoint data
-                      from k8s endpoint slices. defaults to true,
-                      If false then reads endpoint data from the k8s endpoints.
+                    description: FeatureFlags defines toggle to enable new contour
+                      features.
                     items:
                       type: string
                     type: array

examples/render/contour-gateway-provisioner.yaml

@@ -641,12 +641,7 @@ spec:
                     type: object
                 type: object
               featureFlags:
-                description: |-
-                  FeatureFlags defines toggle to enable new contour features.
-                  Available toggles are:
-                  useEndpointSlices - Configures contour to fetch endpoint data
-                  from k8s endpoint slices. defaults to true,
-                  If false then reads endpoint data from the k8s endpoints.
+                description: FeatureFlags defines toggle to enable new contour features.
                 items:
                   type: string
                 type: array
@@ -2812,7 +2807,7 @@ spec:
                             The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                             The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
                             The volume will be mounted read-only (ro) and non-executable files (noexec).
-                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
+                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                             The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                           properties:
                             pullPolicy:
@@ -4484,12 +4479,8 @@ spec:
                         type: object
                     type: object
                   featureFlags:
-                    description: |-
-                      FeatureFlags defines toggle to enable new contour features.
-                      Available toggles are:
-                      useEndpointSlices - Configures contour to fetch endpoint data
-                      from k8s endpoint slices. defaults to true,
-                      If false then reads endpoint data from the k8s endpoints.
+                    description: FeatureFlags defines toggle to enable new contour
+                      features.
                     items:
                       type: string
                     type: array

examples/render/contour-gateway.yaml

@@ -666,12 +666,7 @@ spec:
                     type: object
                 type: object
               featureFlags:
-                description: |-
-                  FeatureFlags defines toggle to enable new contour features.
-                  Available toggles are:
-                  useEndpointSlices - Configures contour to fetch endpoint data
-                  from k8s endpoint slices. defaults to true,
-                  If false then reads endpoint data from the k8s endpoints.
+                description: FeatureFlags defines toggle to enable new contour features.
                 items:
                   type: string
                 type: array
@@ -2837,7 +2832,7 @@ spec:
                             The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field.
                             The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images.
                             The volume will be mounted read-only (ro) and non-executable files (noexec).
-                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath).
+                            Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33.
                             The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type.
                           properties:
                             pullPolicy:
@@ -4509,12 +4504,8 @@ spec:
                         type: object
                     type: object
                   featureFlags:
-                    description: |-
-                      FeatureFlags defines toggle to enable new contour features.
-                      Available toggles are:
-                      useEndpointSlices - Configures contour to fetch endpoint data
-                      from k8s endpoint slices. defaults to true,
-                      If false then reads endpoint data from the k8s endpoints.
+                    description: FeatureFlags defines toggle to enable new contour
+                      features.
                     items:
                       type: string
                     type: array