Skip to content

Patch Pod Annotations to Fix Potential Error #45

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
papillonyi wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Patch Pod Annotations to Fix Potential Error #45

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d8ee4c
Fix bug causing potential pod error by using patch for annotations
papillonyi Jul 17, 2023
a022a38
Grant pod patch permission to clusterRole for annotation updates
papillonyi Jul 17, 2023
de46f05
Revert "Grant pod patch permission to clusterRole for annotation upda…
papillonyi Jul 17, 2023
a8807c7
Introduce error handling for potential JSON encoding errors
papillonyi Jul 17, 2023
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: 22 additions & 3 deletions pkg/plugin/nvidia/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ package nvidia

import (
"context"
"encoding/json"
"fmt"
"k8s.io/apimachinery/pkg/types"
"math"
"strconv"
"strings"
Expand Down Expand Up @@ -188,6 +190,14 @@ func GetGPUIDsFromPodAnnotation(pod *v1.Pod) []int {
return nil
}

type objectForAddAnnotations struct {
Metadata objectMetaForPatch `json:"metadata"`
}

type objectMetaForPatch struct {
Annotations map[string]string `json:"annotations,omitempty" protobuf:"bytes,12,rep,name=annotations"`
}

func UpdatePodAnnotations(kubeClient *kubernetes.Clientset, pod *v1.Pod) error {
pod, err := kubeClient.CoreV1().Pods(pod.Namespace).Get(context.TODO(), pod.Name, metav1.GetOptions{})
if err != nil {
Expand All @@ -196,10 +206,19 @@ func UpdatePodAnnotations(kubeClient *kubernetes.Clientset, pod *v1.Pod) error {
if len(pod.Annotations) == 0 {
pod.Annotations = map[string]string{}
}

pod.Annotations[GPUAssigned] = "true"

// TODO(@hzxuzhonghu): use patch instead
_, err = kubeClient.CoreV1().Pods(pod.Namespace).Update(context.TODO(), pod, metav1.UpdateOptions{})
addAnnotationsPath := objectForAddAnnotations{
Metadata: objectMetaForPatch{
Annotations: pod.Annotations,
},
}

patchBytes, err := json.Marshal(&addAnnotationsPath)
if err != nil {
return err
}

_, err = kubeClient.CoreV1().Pods(pod.Namespace).Patch(context.TODO(), pod.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
return err
}