adding feature flag NativeSidecar

Author: jklaw90

vertical-pod-autoscaler/pkg/features/features.go

@@ -48,6 +48,9 @@ const (
 	// InPlaceOrRecreate enables the InPlaceOrRecreate update mode to be used.
 	// Requires KEP-1287 InPlacePodVerticalScaling feature-gate to be enabled on the cluster.
 	InPlaceOrRecreate featuregate.Feature = "InPlaceOrRecreate"
+
+	// NativeSidecar enables support for native sidecars in VPA
+	NativeSidecar featuregate.Feature = "NativeSidecar"
 )
 
 // MutableFeatureGate is a mutable, versioned, global FeatureGate.

vertical-pod-autoscaler/pkg/features/versioned_features.go

@@ -31,4 +31,7 @@ var defaultVersionedFeatureGates = map[featuregate.Feature]featuregate.Versioned
 		{Version: version.MustParse("1.4"), Default: false, PreRelease: featuregate.Alpha},
 		{Version: version.MustParse("1.5"), Default: true, PreRelease: featuregate.Beta},
 	},
+	NativeSidecar: {
+		{Version: version.MustParse("1.5"), Default: false, PreRelease: featuregate.Alpha},
+	},
 }

vertical-pod-autoscaler/pkg/recommender/input/cluster_feeder.go

@@ -37,6 +37,7 @@ import (
 	vpa_types "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1"
 	vpa_api "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/clientset/versioned/typed/autoscaling.k8s.io/v1"
 	vpa_lister "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/client/listers/autoscaling.k8s.io/v1"
+	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/features"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/recommender/input/history"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/recommender/input/metrics"
 	"k8s.io/autoscaler/vertical-pod-autoscaler/pkg/recommender/input/oom"
@@ -492,7 +493,7 @@ func (feeder *clusterStateFeeder) LoadPods() {
 			}
 		}
 		for _, initContainer := range pod.InitContainers {
-			if initContainer.ContainerType == model.ContainerTypeInitSidecar {
+			if features.Enabled(features.NativeSidecar) && initContainer.ContainerType == model.ContainerTypeInitSidecar {
 				if err = feeder.clusterState.AddOrUpdateContainer(initContainer.ID, initContainer.Request, initContainer.ContainerType); err != nil {
 					klog.V(0).InfoS("Failed to add initContainer", "container", initContainer.ID, "error", err)
 				}