github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100199 from chaitanyabandi/ns-patch

Browse Source 
use Patch API to add namespace label
This commit is contained in:
Kubernetes Prow Robot
2021-03-15 14:20:53 -07:00
committed by GitHub
parent f18caa8fb9 4e0069b909
commit aac64ec9b3
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/apimachinery/webhook.go
View File

@@ -18,6 +18,7 @@ package apimachinery
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"reflect" "reflect"
"strings" "strings"
@@ -2127,13 +2128,13 @@ func labelNamespace(f *framework.Framework, namespace string) {
client := f.ClientSet client := f.ClientSet
// Add a unique label to the namespace // Add a unique label to the namespace
ns, err := client.CoreV1().Namespaces().Get(context.TODO(), namespace, metav1.GetOptions{}) nsPatch, err := json.Marshal(map[string]interface{}{
framework.ExpectNoError(err, "error getting namespace %s", namespace) "metadata": map[string]interface{}{
if ns.Labels == nil { "labels": map[string]string{f.UniqueName: "true"},
ns.Labels = map[string]string{} },
} })
ns.Labels[f.UniqueName] = "true" framework.ExpectNoError(err, "error marshaling namespace %s", namespace)
_, err = client.CoreV1().Namespaces().Update(context.TODO(), ns, metav1.UpdateOptions{}) _, err = client.CoreV1().Namespaces().Patch(context.TODO(), namespace, types.StrategicMergePatchType, nsPatch, metav1.PatchOptions{})
framework.ExpectNoError(err, "error labeling namespace %s", namespace) framework.ExpectNoError(err, "error labeling namespace %s", namespace)
} }