Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using withOauthTokenProvider instead of withOauthToken to support token refresh #6883

Closed
wants to merge 2 commits into from
Closed

Using withOauthTokenProvider instead of withOauthToken to support token refresh #6883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a01040f
withOauthTokenProvider
turboFei Jan 9, 2025
69dd28d
comments
turboFei Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions kyuubi-server/src/main/scala/org/apache/kyuubi/util/KubernetesUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import java.util.Locale
import com.fasterxml.jackson.databind.ObjectMapper
import com.google.common.base.Charsets
import com.google.common.io.Files
import io.fabric8.kubernetes.client.{Config, ConfigBuilder, KubernetesClient, KubernetesClientBuilder}
import io.fabric8.kubernetes.client.{Config, ConfigBuilder, KubernetesClient, KubernetesClientBuilder, OAuthTokenProvider}
import io.fabric8.kubernetes.client.Config.autoConfigure
import io.fabric8.kubernetes.client.okhttp.OkHttpClientFactory
import okhttp3.{Dispatcher, OkHttpClient}
Expand Down Expand Up @@ -78,7 +78,11 @@ object KubernetesUtils extends Logging {
.withOption(oauthTokenValue) { (token, configBuilder) =>
configBuilder.withOauthToken(token)
}.withOption(oauthTokenFile) { (file, configBuilder) =>
configBuilder.withOauthToken(Files.asCharSource(file, Charsets.UTF_8).read())
// Prior to Kubernetes 1.24, the default token never expired.
// In newer versions, it expires after 1 hour by defaults.
configBuilder.withOauthTokenProvider(new OAuthTokenProvider {
turboFei marked this conversation as resolved.
Show resolved Hide resolved
override def getToken: String = Files.asCharSource(file, Charsets.UTF_8).read()
})
}.withOption(caCertFile) { (file, configBuilder) =>
configBuilder.withCaCertFile(file)
}.withOption(clientKeyFile) { (file, configBuilder) =>
Expand Down
Loading