Merge pull request kubernetes#128703 from Jefftree/drop-shouldservebeta-var

k8s-ci-robot · web-flow · commit 3d1834b3d072 · 2024-12-14T00:38:25.000+01:00
Remove shouldServeBeta parameter in apiservice storage
diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
@@ -256,13 +256,7 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg
 		tracerProvider:             c.GenericConfig.TracerProvider,
 	}
 
-	// used later  to filter the served resource by those that have expired.
-	resourceExpirationEvaluator, err := genericapiserver.NewResourceExpirationEvaluator(s.GenericAPIServer.EffectiveVersion.EmulationVersion())
-	if err != nil {
-		return nil, err
-	}
-
-	apiGroupInfo := apiservicerest.NewRESTStorage(c.GenericConfig.MergedResourceConfig, c.GenericConfig.RESTOptionsGetter, resourceExpirationEvaluator.ShouldServeForVersion(1, 22))
+	apiGroupInfo := apiservicerest.NewRESTStorage(c.GenericConfig.MergedResourceConfig, c.GenericConfig.RESTOptionsGetter, false)
 	if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -256,13 +256,7 @@ func (c completedConfig) NewWithDelegate(delegationTarget genericapiserver.Deleg`
`256`	`256`	`tracerProvider: c.GenericConfig.TracerProvider,`
`257`	`257`	`}`
`258`	`258`
`259`		`- // used later to filter the served resource by those that have expired.`
`260`		`- resourceExpirationEvaluator, err := genericapiserver.NewResourceExpirationEvaluator(s.GenericAPIServer.EffectiveVersion.EmulationVersion())`
`261`		`- if err != nil {`
`262`		`- return nil, err`
`263`		`- }`
`264`		`-`
`265`		`- apiGroupInfo := apiservicerest.NewRESTStorage(c.GenericConfig.MergedResourceConfig, c.GenericConfig.RESTOptionsGetter, resourceExpirationEvaluator.ShouldServeForVersion(1, 22))`
	`259`	`+ apiGroupInfo := apiservicerest.NewRESTStorage(c.GenericConfig.MergedResourceConfig, c.GenericConfig.RESTOptionsGetter, false)`
`266`	`260`	`if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil {`
`267`	`261`	`return nil, err`
`268`	`262`	`}`