github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Update: test secret contains a default label, secrets are listed via default label, patch payload is marshaled instead of written in raw JSON, secret deleted check; Fix: comments, test namespace usage

Browse Source
This commit is contained in:
Caleb Woodbine 2020-01-07 19:51:24 +00:00
parent ab12f460d9
commit b4fb46409d
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/e2e/common/secrets.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package common package common
import ( import (
"encoding/json"
"fmt" "fmt"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
@ -142,10 +143,13 @@ var _ = ginkgo.Describe("[sig-api-machinery] Secrets", func() {
secretTestName := "test-secret-" + string(uuid.NewUUID()) secretTestName := "test-secret-" + string(uuid.NewUUID())
// create a secret in namespace default // create a secret in the test namespace
_, err := f.ClientSet.CoreV1().Secrets("default").Create(&v1.Secret{ _, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Create(&v1.Secret{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: secretTestName, Name: secretTestName,
Labels: map[string]string{
"testsecret-constant": "true",
},
}, },
Data: map[string][]byte{ Data: map[string][]byte{
"key": []byte("value"), "key": []byte("value"),
@ -155,8 +159,10 @@ var _ = ginkgo.Describe("[sig-api-machinery] Secrets", func() {
framework.ExpectNoError(err, "failed to create secret") framework.ExpectNoError(err, "failed to create secret")
ginkgo.By("listing secrets in all namespaces to ensure that there are more than zero") ginkgo.By("listing secrets in all namespaces to ensure that there are more than zero")
// list all secrets in namespace default // list all secrets in all namespaces
secretsList, err := f.ClientSet.CoreV1().Secrets("").List(metav1.ListOptions{}) secretsList, err := f.ClientSet.CoreV1().Secrets("").List(metav1.ListOptions{
LabelSelector: "testsecret-constant=true",
})
framework.ExpectNoError(err, "failed to list secrets") framework.ExpectNoError(err, "failed to list secrets")
framework.ExpectNotEqual(len(secretsList.Items), 0, "no secrets found") framework.ExpectNotEqual(len(secretsList.Items), 0, "no secrets found")
@ -171,26 +177,34 @@ var _ = ginkgo.Describe("[sig-api-machinery] Secrets", func() {
framework.ExpectEqual(foundCreatedSecret, true, "unable to find secret by its value") framework.ExpectEqual(foundCreatedSecret, true, "unable to find secret by its value")
ginkgo.By("patching the secret") ginkgo.By("patching the secret")
// patch the secret // patch the secret in the test namespace
secretPatchNewData := base64.StdEncoding.EncodeToString([]byte("value1")) secretPatchNewData := base64.StdEncoding.EncodeToString([]byte("value1"))
secretPatch := fmt.Sprintf(`{"metadata":{"labels":{"testsecret":"true"}},"data":{"key":"%v"}}`, secretPatchNewData) secretPatch, err := json.Marshal(map[string]interface{}{
_, err = f.ClientSet.CoreV1().Secrets("default").Patch(secretCreatedName, types.StrategicMergePatchType, []byte(secretPatch)) "metadata": map[string]interface{}{
"labels": map[string]string{"testsecret": "true"},
},
"data": map[string][]byte{"key": []byte(secretPatchNewData)},
})
framework.ExpectNoError(err, "failed to marshal JSON")
_, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Patch(secretCreatedName, types.StrategicMergePatchType, []byte(secretPatch))
framework.ExpectNoError(err, "failed to patch secret") framework.ExpectNoError(err, "failed to patch secret")
ginkgo.By("deleting the secret using a LabelSelector") ginkgo.By("deleting the secret using a LabelSelector")
err = f.ClientSet.CoreV1().Secrets("default").DeleteCollection(&metav1.DeleteOptions{}, metav1.ListOptions{ err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).DeleteCollection(&metav1.DeleteOptions{}, metav1.ListOptions{
LabelSelector: "testsecret=true", LabelSelector: "testsecret=true",
}) })
framework.ExpectNoError(err, "failed to delete patched secret") framework.ExpectNoError(err, "failed to delete patched secret")
ginkgo.By("listing secrets in all namespaces, searching for label name and value in patch") ginkgo.By("listing secrets in all namespaces, searching for label name and value in patch")
// list all secrets in namespace default // list all secrets in all namespaces
secretsList, err = f.ClientSet.CoreV1().Secrets("").List(metav1.ListOptions{}) secretsList, err = f.ClientSet.CoreV1().Secrets("").List(metav1.ListOptions{
LabelSelector: "testsecret-constant=true",
})
framework.ExpectNoError(err, "failed to list secrets") framework.ExpectNoError(err, "failed to list secrets")
foundCreatedSecret = false foundCreatedSecret = false
for _, val := range secretsList.Items { for _, val := range secretsList.Items {
if val.ObjectMeta.Name == secretTestName && string(val.Data["key"]) == "value" { if val.ObjectMeta.Name == secretTestName && val.ObjectMeta.Namespace == f.Namespace.Name {
foundCreatedSecret = true foundCreatedSecret = true
} }
} }