From b845fee7f7811e4c2496d71dd7b3ce3035adc522 Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Thu, 1 Aug 2019 13:00:59 -0700 Subject: [PATCH 1/3] Add ConfigMap patch e2e test with validation step Test originally written by draveness for this PR: https://github.com/kubernetes/kubernetes/pull/78924 This commit adds a validation step to the test. --- test/e2e/common/configmap.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/test/e2e/common/configmap.go b/test/e2e/common/configmap.go index bb26aa647c7..4d0a22c49ea 100644 --- a/test/e2e/common/configmap.go +++ b/test/e2e/common/configmap.go @@ -27,6 +27,7 @@ import ( imageutils "k8s.io/kubernetes/test/utils/image" "github.com/onsi/ginkgo" + "github.com/onsi/gomega" ) var _ = ginkgo.Describe("[sig-node] ConfigMap", func() { @@ -134,6 +135,27 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() { configMap, err := newConfigMapWithEmptyKey(f) framework.ExpectError(err, "created configMap %q with empty key in namespace %q", configMap.Name, f.Namespace.Name) }) + + ginkgo.It("should patch ConfigMap successfully", func() { + name := "configmap-test-" + string(uuid.NewUUID()) + configMap := newConfigMap(f, name) + configMapOriginalState := *configMap + ginkgo.By(fmt.Sprintf("Creating configMap %v/%v", f.Namespace.Name, configMap.Name)) + _, err := f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Create(configMap) + framework.ExpectNoError(err) + + configMap.Data = map[string]string{ + "data": "value", + } + ginkgo.By(fmt.Sprintf("Updating configMap %v/%v", f.Namespace.Name, configMap.Name)) + _, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Update(configMap) + framework.ExpectNoError(err) + + configMapFromUpdate, err := f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Get(name, metav1.GetOptions{}) + framework.ExpectNoError(err) + ginkgo.By(fmt.Sprintf("Verifying update of configMap %v/%v", f.Namespace.Name, configMap.Name)) + gomega.Expect(configMapFromUpdate.Data).NotTo(gomega.Equal(configMapOriginalState.Data)) + }) }) func newEnvFromConfigMap(f *framework.Framework, name string) *v1.ConfigMap { From b10743236ef08ab8cf4b3cf5ac4ea9911db453fa Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Tue, 6 Aug 2019 01:53:08 +0000 Subject: [PATCH 2/3] Update function for data inequality verification --- test/e2e/common/configmap.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/e2e/common/configmap.go b/test/e2e/common/configmap.go index 4d0a22c49ea..5e7f831bbf1 100644 --- a/test/e2e/common/configmap.go +++ b/test/e2e/common/configmap.go @@ -19,7 +19,7 @@ package common import ( "fmt" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" @@ -27,7 +27,6 @@ import ( imageutils "k8s.io/kubernetes/test/utils/image" "github.com/onsi/ginkgo" - "github.com/onsi/gomega" ) var _ = ginkgo.Describe("[sig-node] ConfigMap", func() { @@ -154,7 +153,7 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() { configMapFromUpdate, err := f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Get(name, metav1.GetOptions{}) framework.ExpectNoError(err) ginkgo.By(fmt.Sprintf("Verifying update of configMap %v/%v", f.Namespace.Name, configMap.Name)) - gomega.Expect(configMapFromUpdate.Data).NotTo(gomega.Equal(configMapOriginalState.Data)) + framework.ExpectNotEqual(configMapFromUpdate.Data, configMapOriginalState.Data) }) }) From 7218182f119f5b6fe051393b1bd3e026dce63f0c Mon Sep 17 00:00:00 2001 From: Caleb Woodbine Date: Wed, 7 Aug 2019 03:35:36 +0000 Subject: [PATCH 3/3] Update configMap data checking --- test/e2e/common/configmap.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/common/configmap.go b/test/e2e/common/configmap.go index 5e7f831bbf1..c02eb966a05 100644 --- a/test/e2e/common/configmap.go +++ b/test/e2e/common/configmap.go @@ -138,7 +138,6 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() { ginkgo.It("should patch ConfigMap successfully", func() { name := "configmap-test-" + string(uuid.NewUUID()) configMap := newConfigMap(f, name) - configMapOriginalState := *configMap ginkgo.By(fmt.Sprintf("Creating configMap %v/%v", f.Namespace.Name, configMap.Name)) _, err := f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Create(configMap) framework.ExpectNoError(err) @@ -153,7 +152,7 @@ var _ = ginkgo.Describe("[sig-node] ConfigMap", func() { configMapFromUpdate, err := f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Get(name, metav1.GetOptions{}) framework.ExpectNoError(err) ginkgo.By(fmt.Sprintf("Verifying update of configMap %v/%v", f.Namespace.Name, configMap.Name)) - framework.ExpectNotEqual(configMapFromUpdate.Data, configMapOriginalState.Data) + framework.ExpectEqual(configMapFromUpdate.Data, configMap.Data) }) })