Skip to content

clean the kube2iam annotations when the role is empty #3173

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
tcondeixa wants to merge 4 commits into
base: master
Choose a base branch
from
+25 −0
Open

clean the kube2iam annotations when the role is empty #3173

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33ced6c
clean the kube2iam annotations when the role is empty
tcondeixa Aug 18, 2026
0e4b461
reuse existing block that define the annotations
tcondeixa Aug 19, 2026
23c2bc0
keep a single api call
tcondeixa Aug 19, 2026
952dce0
check also job annotation to trigger deletion
tcondeixa Aug 19, 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
25 changes: 25 additions & 0 deletions pkg/cluster/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1793,6 +1793,31 @@ func (c *Cluster) syncLogicalBackupJob() error {
return fmt.Errorf("could not patch annotations of the logical backup job %q: %v", jobName, err)
}
}

@FxKu FxKu Aug 19, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think the code lines before are there to remove annotations. For the pod template here and for the job itself here. Do we really need an extra patch for the KubeIAmAnnotation?

_, kubeIamInCronJob := job.Annotations[constants.KubeIAmAnnotation]
_, kubeIamInTemplate := job.Spec.JobTemplate.Annotations[constants.KubeIAmAnnotation]
if kubeIamInCronJob || kubeIamInTemplate {
if _, exists := desiredJob.Annotations[constants.KubeIAmAnnotation]; !exists {
patchData, err := json.Marshal(map[string]interface{}{
"metadata": map[string]interface{}{
"annotations": map[string]*string{constants.KubeIAmAnnotation: nil},
},
"spec": map[string]interface{}{
"jobTemplate": map[string]interface{}{
"metadata": map[string]interface{}{
"annotations": map[string]*string{constants.KubeIAmAnnotation: nil},
},
},
},
})
if err != nil {
return fmt.Errorf("could not form patch to remove kube2iam annotation from logical backup job %q: %v", jobName, err)
}
_, err = c.KubeClient.CronJobs(c.Namespace).Patch(context.TODO(), jobName, types.MergePatchType, patchData, metav1.PatchOptions{})
if err != nil {
return fmt.Errorf("could not remove kube2iam annotation from logical backup job %q: %v", jobName, err)
}
}
}
c.LogicalBackupJob = desiredJob
return nil
}
Expand Down