Skip to content

Fix generating incorrect names for Jobs when generateName is used #718

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix generating incorrect names for Jobs when generateName is used #718

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6dfcba
fix generating incorrect names for Jobs
May 9, 2025
e9b4195
use assert.Empty
May 9, 2025
fc2c758
use TrimFunc to keep only letters,numbers and dash
May 9, 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
2 changes: 1 addition & 1 deletion pkg/sync/sync_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,7 @@ func (sc *syncContext) getSyncTasks() (_ syncTasks, successful bool) {
if targetObj.GetName() == "" {
var syncRevision string
if len(sc.revision) >= 8 {
syncRevision = sc.revision[0:7]
syncRevision = strings.Trim(sc.revision[0:7], ".")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Semver also allows dashes (-) and plus (+), I would trim for that too.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dashes should be fine. Let's keep only letters, numbers and -.

} else {
syncRevision = sc.revision
}
Expand Down
19 changes: 19 additions & 0 deletions pkg/sync/sync_context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/validation"

"github.com/go-logr/logr"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -977,6 +978,24 @@
assert.Contains(t, tasks[1].name(), "foobar-postsync-")
assert.Equal(t, "", pod.GetName())
})

t.Run("Long revision with dots", func(t *testing.T) {
syncCtx := newTestSyncCtx(nil)
pod := testingutils.NewPod()
pod.SetName("")
pod.SetAnnotations(map[string]string{synccommon.AnnotationKeyHook: "PreSync,PostSync"})
syncCtx.hooks = []*unstructured.Unstructured{pod}
syncCtx.revision = "f.ooba.r"
tasks, successful := syncCtx.getSyncTasks()

assert.True(t, successful)
assert.Len(t, tasks, 2)
assert.Contains(t, tasks[0].name(), "f.ooba-presync-")
assert.Contains(t, tasks[1].name(), "f.ooba-postsync-")
assert.Equal(t, "", pod.GetName())
assert.Empty(t, validation.IsDNS1123Subdomain(tasks[0].name()))

Check failure on line 996 in pkg/sync/sync_context_test.go

View workflow job for this annotation

GitHub Actions / test 

File is not properly formatted (gofumpt)
assert.Empty(t, validation.IsDNS1123Subdomain(tasks[1].name()))
})
}

func TestManagedResourceAreNotNamed(t *testing.T) {
Expand Down
Loading