Skip to content

fix(webhook): merge dataset annotations in multi-round FUSE injection #5974

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

Merged
cheyang merged 2 commits into from
Jun 15, 2026
+50 −6
Merged

fix(webhook): merge dataset annotations in multi-round FUSE injection #5974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c146bd
fix(webhook): merge dataset annotations in multi-round FUSE injection
Sukuna0007Abhi Jun 10, 2026
7931adb
fix(webhook): filter empty strings in dataset usage injector and add …
Sukuna0007Abhi Jun 14, 2026
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
24 changes: 20 additions & 4 deletions pkg/webhook/plugins/datasetusageinjector/dataset_usage_injector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ func NewPlugin(c client.Client, args string) (api.MutatingHandler, error) {
}, nil
}

// TODO: Support cases where fuse sidecars are injected in multi-round. Currently, only dataset names in the first round will be recorded.
func (injector *DatasetUsageInjector) Mutate(pod *corev1.Pod, runtimeInfos map[string]base.RuntimeInfoInterface) (shouldStop bool, err error) {
if len(runtimeInfos) == 0 {
return false, nil
Expand All @@ -44,13 +43,30 @@ func (injector *DatasetUsageInjector) Mutate(pod *corev1.Pod, runtimeInfos map[s
podName = pod.GenerateName
}

datasetsInUse := make([]string, 0, len(runtimeInfos))
annotationKey := common.LabelAnnotationDatasetsInUse

datasetsInUseMap := make(map[string]struct{})

// 1. Read existing datasets from annotation
if existingVal, exists := pod.Annotations[annotationKey]; exists && len(existingVal) > 0 {
existingDatasets := strings.Split(existingVal, ",")
for _, ds := range existingDatasets {
datasetsInUseMap[strings.TrimSpace(ds)] = struct{}{}
}
Comment thread
Sukuna0007Abhi marked this conversation as resolved.
Comment thread
Sukuna0007Abhi marked this conversation as resolved.
}
Comment thread
Sukuna0007Abhi marked this conversation as resolved.

// 2. Add new datasets from current round
for _, runtimeInfo := range runtimeInfos {
datasetsInUse = append(datasetsInUse, runtimeInfo.GetName())
datasetsInUseMap[runtimeInfo.GetName()] = struct{}{}
}

// 3. Convert map to sorted slice
datasetsInUse := make([]string, 0, len(datasetsInUseMap))
for ds := range datasetsInUseMap {
datasetsInUse = append(datasetsInUse, ds)
}
slices.Sort(datasetsInUse)

annotationKey := common.LabelAnnotationDatasetsInUse
annotationValue := strings.Join(datasetsInUse, ",")

log.Info("Injecting dataset usage annotation to pod",
Expand Down
4 changes: 2 additions & 2 deletions pkg/webhook/plugins/datasetusageinjector/dataset_usage_injector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ var _ = Describe("DatasetUsageInjector", func() {
})

Context("when pod has different annotation value", func() {
It("should update the annotation", func() {
It("should merge the existing annotation with the new one", func() {
pod := &corev1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: "test-update",
Expand All @@ -188,7 +188,7 @@ var _ = Describe("DatasetUsageInjector", func() {
Expect(err).NotTo(HaveOccurred())
Expect(shouldStop).To(BeFalse())

Expect(pod.Annotations[common.LabelAnnotationDatasetsInUse]).To(Equal("demo-dataset-1"))
Expect(pod.Annotations[common.LabelAnnotationDatasetsInUse]).To(Equal("demo-dataset-1,old-dataset"))
})
})
})
Expand Down
Loading