Merge pull request #101601 from AliceZhang2016/indexed-job-stable-hostname
specify pod name and hostname in indexed job Kubernetes-commit: f4f238e038cd47acff4b752c2726f5b3116aa22c
This commit is contained in:
commit
c13376c1a6
|
@ -924,7 +924,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/api",
|
||||
"Rev": "d5fda5562a2e"
|
||||
"Rev": "532146f2aa2a"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/apimachinery",
|
||||
|
@ -932,7 +932,7 @@
|
|||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/client-go",
|
||||
"Rev": "b0c8a7cef141"
|
||||
"Rev": "13cd91989c04"
|
||||
},
|
||||
{
|
||||
"ImportPath": "k8s.io/component-base",
|
||||
|
|
8
go.mod
8
go.mod
|
@ -38,9 +38,9 @@ require (
|
|||
google.golang.org/grpc v1.27.1
|
||||
gopkg.in/natefinch/lumberjack.v2 v2.0.0
|
||||
gopkg.in/square/go-jose.v2 v2.2.2
|
||||
k8s.io/api v0.0.0-20210519190848-d5fda5562a2e
|
||||
k8s.io/api v0.0.0-20210520030843-532146f2aa2a
|
||||
k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168
|
||||
k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141
|
||||
k8s.io/client-go v0.0.0-20210520031137-13cd91989c04
|
||||
k8s.io/component-base v0.0.0-20210519191730-8b08f85f6db5
|
||||
k8s.io/klog/v2 v2.8.0
|
||||
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
|
||||
|
@ -51,8 +51,8 @@ require (
|
|||
)
|
||||
|
||||
replace (
|
||||
k8s.io/api => k8s.io/api v0.0.0-20210519190848-d5fda5562a2e
|
||||
k8s.io/api => k8s.io/api v0.0.0-20210520030843-532146f2aa2a
|
||||
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141
|
||||
k8s.io/client-go => k8s.io/client-go v0.0.0-20210520031137-13cd91989c04
|
||||
k8s.io/component-base => k8s.io/component-base v0.0.0-20210519191730-8b08f85f6db5
|
||||
)
|
||||
|
|
8
go.sum
8
go.sum
|
@ -684,12 +684,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
|
|||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
||||
honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
|
||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
||||
k8s.io/api v0.0.0-20210519190848-d5fda5562a2e h1:NqV6nJIdQDUI6QvFuT+QDcc2s3kcWYUecGbTc74Y4GU=
|
||||
k8s.io/api v0.0.0-20210519190848-d5fda5562a2e/go.mod h1:pYZcnMa1kuzJ76ydALsvcwPMSsRcNNkhMonm1K/9Umo=
|
||||
k8s.io/api v0.0.0-20210520030843-532146f2aa2a h1:yk/O+aWhhXDM4xeO2KvPxpVp358XGaYIgSRmpxbDYak=
|
||||
k8s.io/api v0.0.0-20210520030843-532146f2aa2a/go.mod h1:pYZcnMa1kuzJ76ydALsvcwPMSsRcNNkhMonm1K/9Umo=
|
||||
k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168 h1:mkBvQhy9WPz7t0Y3Muea1rVq2TRB91wvC8iE8xpbfl4=
|
||||
k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168/go.mod h1:4rwBOLnlX0KG0S4eNjF9Aw8Y92JlZQe1fX+e7TeGWQE=
|
||||
k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141 h1:5BYLcOnAmuK8uH77cStSu8prBPQ1B3e8j9Sr9P3R2rQ=
|
||||
k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141/go.mod h1:ivtaxlOm0rw7eIAy6tUle/YMhQS+k4qdRVfmUtc5ccM=
|
||||
k8s.io/client-go v0.0.0-20210520031137-13cd91989c04 h1:KHoeN9w4InHzjOTG4iZwV9eSoLYrMjbrYTSBuHHfIEM=
|
||||
k8s.io/client-go v0.0.0-20210520031137-13cd91989c04/go.mod h1:wGzLrl6E13KhgK+u/0f7oKRmlHtOoPE05SjftC+Vthc=
|
||||
k8s.io/component-base v0.0.0-20210519191730-8b08f85f6db5 h1:hZyg3j2gVMCWnskmW3xhru5+QT65sJxvE8gnJAa7cOU=
|
||||
k8s.io/component-base v0.0.0-20210519191730-8b08f85f6db5/go.mod h1:nQZK7G4tfT/SzzvhPuplAUyGMLzSR2hc4xDXQoZVICg=
|
||||
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
|
|
|
@ -43,12 +43,12 @@ const (
|
|||
// TODO: make this flexible for non-core resources with alternate naming rules.
|
||||
maxNameLength = 63
|
||||
randomLength = 5
|
||||
maxGeneratedNameLength = maxNameLength - randomLength
|
||||
MaxGeneratedNameLength = maxNameLength - randomLength
|
||||
)
|
||||
|
||||
func (simpleNameGenerator) GenerateName(base string) string {
|
||||
if len(base) > maxGeneratedNameLength {
|
||||
base = base[:maxGeneratedNameLength]
|
||||
if len(base) > MaxGeneratedNameLength {
|
||||
base = base[:MaxGeneratedNameLength]
|
||||
}
|
||||
return fmt.Sprintf("%s%s", base, utilrand.String(randomLength))
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue