also hash binarydata in configmaps

pkg/controller/daemonset/daemonset_controller_test.go

@@ -201,7 +201,7 @@ var _ = Describe("DaemonSet controller Suite", func() {
 				eventMessage := func(event *corev1.Event) string {
 					return event.Message
 				}
-				hashMessage := "Configuration hash updated to ebabf80ef45218b27078a41ca16b35a4f91cb5672f389e520ae9da6ee3df3b1c"
+				hashMessage := "Configuration hash updated to bd786f47ef9b79841ddba1059752f95c4fe21906df5e2964786b4658e02758d5"
 				Eventually(func() *corev1.EventList {
 					events := &corev1.EventList{}
 					m.Client.List(context.TODO(), events)

pkg/controller/deployment/deployment_controller_test.go

@@ -204,7 +204,7 @@ var _ = Describe("Deployment controller Suite", func() {
 				eventMessage := func(event *corev1.Event) string {
 					return event.Message
 				}
-				hashMessage := "Configuration hash updated to ebabf80ef45218b27078a41ca16b35a4f91cb5672f389e520ae9da6ee3df3b1c"
+				hashMessage := "Configuration hash updated to bd786f47ef9b79841ddba1059752f95c4fe21906df5e2964786b4658e02758d5"
 				Eventually(func() *corev1.EventList {
 					events := &corev1.EventList{}
 					m.Client.List(context.TODO(), events)

pkg/controller/statefulset/statefulset_controller_test.go

@@ -206,7 +206,7 @@ var _ = Describe("StatefulSet controller Suite", func() {
 				eventMessage := func(event *corev1.Event) string {
 					return event.Message
 				}
-				hashMessage := "Configuration hash updated to ebabf80ef45218b27078a41ca16b35a4f91cb5672f389e520ae9da6ee3df3b1c"
+				hashMessage := "Configuration hash updated to bd786f47ef9b79841ddba1059752f95c4fe21906df5e2964786b4658e02758d5"
 				Eventually(func() *corev1.EventList {
 					events := &corev1.EventList{}
 					m.Client.List(context.TODO(), events)

pkg/core/handler_test.go

@@ -194,7 +194,7 @@ var _ = Describe("Wave controller Suite", func() {
 				eventMessage := func(event *corev1.Event) string {
 					return event.Message
 				}
-				hashMessage := "Configuration hash updated to ebabf80ef45218b27078a41ca16b35a4f91cb5672f389e520ae9da6ee3df3b1c"
+				hashMessage := "Configuration hash updated to bd786f47ef9b79841ddba1059752f95c4fe21906df5e2964786b4658e02758d5"
 				Eventually(func() *corev1.EventList {
 					events := &corev1.EventList{}
 					m.Client.List(context.TODO(), events)

pkg/core/hash.go

@@ -30,10 +30,10 @@ import (
 func calculateConfigHash(children []configObject) (string, error) {
 	// hashSource contains all the data to be hashed
 	hashSource := struct {
-		ConfigMaps map[string]map[string]string `json:"configMaps"`
+		ConfigMaps map[string]map[string][]byte `json:"configMaps"`
 		Secrets    map[string]map[string][]byte `json:"secrets"`
 	}{
-		ConfigMaps: make(map[string]map[string]string),
+		ConfigMaps: make(map[string]map[string][]byte),
 		Secrets:    make(map[string]map[string][]byte),
 	}
 
@@ -65,14 +65,24 @@ func calculateConfigHash(children []configObject) (string, error) {
 
 // getConfigMapData extracts all the relevant data from the ConfigMap, whether that is
 // the whole ConfigMap or only the specified keys.
-func getConfigMapData(child configObject) map[string]string {
+func getConfigMapData(child configObject) map[string][]byte {
 	cm := *child.object.(*corev1.ConfigMap)
 	if child.allKeys {
-		return cm.Data
+		data := make(map[string][]byte)
+		for key := range cm.Data {
+			data[key] = []byte(cm.Data[key])
+		}
+		for key := range cm.BinaryData {
+			data[key] = cm.BinaryData[key]
+		}
+		return data
 	}
-	keyData := make(map[string]string)
+	keyData := make(map[string][]byte)
 	for key := range child.keys {
 		if value, exists := cm.Data[key]; exists {
+			keyData[key] = []byte(value)
+		}
+		if value, exists := cm.BinaryData[key]; exists {
 			keyData[key] = value
 		}
 	}

pkg/core/hash_test.go

@@ -17,10 +17,11 @@ limitations under the License.
 package core
 
 import (
-	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sync"
 	"time"
 
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/wave-k8s/wave/test/utils"
@@ -97,7 +98,7 @@ var _ = Describe("Wave hash Suite", func() {
 			)
 		})
 
-		It("returns a different hash when an allKeys child's data is updated", func() {
+		It("returns a different hash when an allKeys child's configmap string data is updated", func() {
 			c := []configObject{
 				{object: cm1, allKeys: true},
 				{object: cm2, allKeys: true},
@@ -120,7 +121,7 @@ var _ = Describe("Wave hash Suite", func() {
 			Expect(h2).NotTo(Equal(h1))
 		})
 
-		It("returns a different hash when an all-field child's data is updated", func() {
+		It("returns a different hash when an allKeys child's configmap binary data is updated", func() {
 			c := []configObject{
 				{object: cm1, allKeys: true},
 				{object: cm2, allKeys: true},
@@ -133,7 +134,30 @@ var _ = Describe("Wave hash Suite", func() {
 
 			m.Update(cm1, func(obj client.Object) client.Object {
 				cm := obj.(*corev1.ConfigMap)
-				cm.Data["key1"] = modified
+				cm.BinaryData["binary_key1"] = []byte(modified)
+
+				return cm
+			}, timeout).Should(Succeed())
+			h2, err := calculateConfigHash(c)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(h2).NotTo(Equal(h1))
+		})
+
+		It("returns a different hash when an allKeys child's secret data is updated", func() {
+			c := []configObject{
+				{object: cm1, allKeys: true},
+				{object: cm2, allKeys: true},
+				{object: s1, allKeys: true},
+				{object: s2, allKeys: true},
+			}
+
+			h1, err := calculateConfigHash(c)
+			Expect(err).NotTo(HaveOccurred())
+
+			m.Update(s1, func(obj client.Object) client.Object {
+				cm := obj.(*corev1.Secret)
+				cm.Data["key1"] = []byte("modified")
 
 				return cm
 			}, timeout).Should(Succeed())
@@ -146,7 +170,8 @@ var _ = Describe("Wave hash Suite", func() {
 		It("returns a different hash when a single-field child's data is updated", func() {
 			c := []configObject{
 				{object: cm1, allKeys: false, keys: map[string]struct{}{
-					"key1": {},
+					"key1":        {},
+					"binary_key1": {},
 				},
 				},
 				{object: cm2, allKeys: true},
@@ -166,23 +191,40 @@ var _ = Describe("Wave hash Suite", func() {
 
 				return cm
 			}, timeout).Should(Succeed())
+			h2, err := calculateConfigHash(c)
+			Expect(err).NotTo(HaveOccurred())
+
+			m.Update(cm1, func(obj client.Object) client.Object {
+				cm := obj.(*corev1.ConfigMap)
+				cm.BinaryData["binary_key1"] = []byte(modified)
+
+				return cm
+			}, timeout).Should(Succeed())
+			h3, err := calculateConfigHash(c)
+			Expect(err).NotTo(HaveOccurred())
 
 			m.Update(s1, func(obj client.Object) client.Object {
 				s := obj.(*corev1.Secret)
 				s.Data["key1"] = []byte("modified")
 
 				return s
 			}, timeout).Should(Succeed())
-			h2, err := calculateConfigHash(c)
+			h4, err := calculateConfigHash(c)
 			Expect(err).NotTo(HaveOccurred())
 
 			Expect(h2).NotTo(Equal(h1))
+			Expect(h3).NotTo(Equal(h1))
+			Expect(h3).NotTo(Equal(h2))
+			Expect(h4).NotTo(Equal(h1))
+			Expect(h4).NotTo(Equal(h2))
+			Expect(h4).NotTo(Equal(h3))
 		})
 
 		It("returns the same hash when a single-field child's data is updated but not for that field", func() {
 			c := []configObject{
 				{object: cm1, allKeys: false, keys: map[string]struct{}{
-					"key1": {},
+					"key1":        {},
+					"binary_key1": {},
 				},
 				},
 				{object: cm2, allKeys: true},
@@ -199,6 +241,7 @@ var _ = Describe("Wave hash Suite", func() {
 			m.Update(cm1, func(obj client.Object) client.Object {
 				cm := obj.(*corev1.ConfigMap)
 				cm.Data["key3"] = modified
+				cm.BinaryData["binary_key3"] = []byte("modified")
 
 				return cm
 			}, timeout).Should(Succeed())

test/utils/test_objects.go

@@ -736,6 +736,11 @@ var ExampleConfigMap1 = &corev1.ConfigMap{
 		"key2": "example1:key2",
 		"key3": "example1:key3",
 	},
+	BinaryData: map[string][]byte{
+		"binary_key1": []byte("example1:binary_key1"),
+		"binary_key2": []byte("example1:binary_key2"),
+		"binary_key3": []byte("example1:binary_key3"),
+	},
 }
 
 // ExampleConfigMap2 is an example ConfigMap object for use within test suites