UPSTREAM: <carry>: fixup for 'collapse closer to kube authentication stack'
Due to a failure of the commit checker, this change was missed during
the last rebase. It should be collapsed into commit with the
referenced commit message.
@@ -137,8 +137,7 @@ func ConfigToFlags(kubeAPIServerConfig *kubecontrolplanev1.KubeAPIServerConfig)
configflags.SetIfUnset(args, "requestheader-group-headers", kubeAPIServerConfig.AuthConfig.RequestHeader.GroupHeaders...)
configflags.SetIfUnset(args, "requestheader-username-headers", kubeAPIServerConfig.AuthConfig.RequestHeader.UsernameHeaders...)
configflags.SetIfUnset(args, "secure-port", portString)
- // TODO uncomment this once we list each file individually. This requires updating the kube-apiserver-operator to separate the files I think
- //configflags.SetIfUnset(args, "service-account-key-file", kubeAPIServerConfig.ServiceAccountPublicKeyFiles...)
+ configflags.SetIfUnset(args, "service-account-key-file", kubeAPIServerConfig.ServiceAccountPublicKeyFiles...)
configflags.SetIfUnset(args, "service-account-lookup", "true")
configflags.SetIfUnset(args, "service-cluster-ip-range", kubeAPIServerConfig.ServicesSubnet)
configflags.SetIfUnset(args, "service-node-port-range", kubeAPIServerConfig.ServicesNodePortRange)
