github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100262 from chaitanyabandi/daemon-ns-patch

Browse Source 
use Patch API to add namespace annotations
This commit is contained in:
Kubernetes Prow Robot 2021-04-29 11:36:11 -07:00 committed by GitHub
commit eb326fdc07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/apps/daemon_set.go
View File

@ -19,6 +19,7 @@ package apps
import ( import (
"bytes" "bytes"
"context" "context"
"encoding/json"
"fmt" "fmt"
"math/rand" "math/rand"
"reflect" "reflect"
@ -137,7 +138,7 @@ var _ = SIGDescribe("Daemon set [Serial]", func() {
c = f.ClientSet c = f.ClientSet
updatedNS, err := updateNamespaceAnnotations(c, ns) updatedNS, err := patchNamespaceAnnotations(c, ns)
framework.ExpectNoError(err) framework.ExpectNoError(err)
ns = updatedNS.Name ns = updatedNS.Name
@ -884,24 +885,24 @@ func clearDaemonSetNodeLabels(c clientset.Interface) error {
return nil return nil
} }
// updateNamespaceAnnotations sets node selectors related annotations on tests namespaces to empty // patchNamespaceAnnotations sets node selectors related annotations on tests namespaces to empty
func updateNamespaceAnnotations(c clientset.Interface, nsName string) (*v1.Namespace, error) { func patchNamespaceAnnotations(c clientset.Interface, nsName string) (*v1.Namespace, error) {
nsClient := c.CoreV1().Namespaces() nsClient := c.CoreV1().Namespaces()
ns, err := nsClient.Get(context.TODO(), nsName, metav1.GetOptions{}) annotations := make(map[string]string)
for _, n := range NamespaceNodeSelectors {
annotations[n] = ""
}
nsPatch, err := json.Marshal(map[string]interface{}{
"metadata": map[string]interface{}{
"annotations": annotations,
},
})
if err != nil { if err != nil {
return nil, err return nil, err
} }
if ns.Annotations == nil { return nsClient.Patch(context.TODO(), nsName, types.StrategicMergePatchType, nsPatch, metav1.PatchOptions{})
ns.Annotations = make(map[string]string)
}
for _, n := range NamespaceNodeSelectors {
ns.Annotations[n] = ""
}
return nsClient.Update(context.TODO(), ns, metav1.UpdateOptions{})
} }
func setDaemonSetNodeLabels(c clientset.Interface, nodeName string, labels map[string]string) (*v1.Node, error) { func setDaemonSetNodeLabels(c clientset.Interface, nodeName string, labels map[string]string) (*v1.Node, error) {