Skip to content

[SPARK-40997][K8S] K8s resource name prefix should start w/ alphanumeric #38483

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

Closed
wants to merge 2 commits into from
Closed

[SPARK-40997][K8S] K8s resource name prefix should start w/ alphanumeric #38483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d058a2
[SPARK-40997][K8S] K8s resource name prefix should start w/ alphanumeric
pan3793 Nov 2, 2022
0254fc0
ut
pan3793 Nov 2, 2022
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
5 changes: 5 additions & 0 deletions ...-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/KubernetesConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,17 @@ private[spark] object KubernetesConf {
s"spark-${UUID.randomUUID().toString.replaceAll("-", "")}"

def getResourceNamePrefix(appName: String): String = {
// Most resource types require a name that can be used as a DNS subdomain name, the name must
// contain only lowercase alphanumeric characters, '-' or '.', and start with an alphanumeric
// character.
// https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#dns-subdomain-names
val id = KubernetesUtils.uniqueID()
s"$appName-$id"
.trim
.toLowerCase(Locale.ROOT)
.replaceAll("[^a-z0-9\\-]", "-")
.replaceAll("-+", "-")
.stripPrefix("-")
}

def getAppNameLabel(appName: String): String = {
Expand Down
8 changes: 8 additions & 0 deletions ...gers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/KubernetesConfSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,4 +250,12 @@ class KubernetesConfSuite extends SparkFunSuite {
assert(KubernetesConf.getAppNameLabel("a" * 62 + "-aaa") === "a" * 62)
assert(KubernetesConf.getAppNameLabel("-" + "a" * 63) === "a" * 62)
}

test("SPARK-40997: K8s resource name prefix should start w/ alphanumeric") {
// scalastyle:off nonascii
Seq("-hello-", "测试").foreach { appName =>
// scalastyle:on nonascii
assert(KubernetesConf.getResourceNamePrefix(appName).matches("^[a-z0-9][a-z0-9\\-]*"))
}
}
}