UPSTREAM: <carry>: openshift-kube-apiserver: add kube-apiserver patches

bertinatto · bertinatto · commit bd4684a68d88 · 2024-11-28T07:30:14.000-03:00
diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
@@ -121,7 +121,7 @@ cluster's shared state through which all other components interact.`,
 					return err
 				}
 				// initialize feature gates again with the new flags
-				if err := utilversion.DefaultComponentGlobalsRegistry.Set(); err != nil {
+				if err := featuregate.DefaultComponentGlobalsRegistry.Set(); err != nil {
 					return err
 				}
 

Original file line number	Diff line number	Diff line change
@@ -121,7 +121,7 @@ cluster's shared state through which all other components interact.`,
`121`	`121`	`return err`
`122`	`122`	`}`
`123`	`123`	`// initialize feature gates again with the new flags`
`124`		`- if err := utilversion.DefaultComponentGlobalsRegistry.Set(); err != nil {`
	`124`	`+ if err := featuregate.DefaultComponentGlobalsRegistry.Set(); err != nil {`
`125`	`125`	`return err`
`126`	`126`	`}`
`127`	`127`