helm2; Check configmap/secret struct for updating (#497) (#498)

* Check configmap/secret struct for updating (#497)

* update go mode

* compare configmap data structure

* fix imports

* add changelog

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix YAML comparison for chart configmaps and secrets.
+
 ## [1.0.11] - 2020-09-17
 
 ### Added

go.mod

@@ -3,6 +3,7 @@ module github.com/giantswarm/app-operator
 go 1.13
 
 require (
+	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/giantswarm/apiextensions v0.4.8
 	github.com/giantswarm/appcatalog v0.2.5
 	github.com/giantswarm/backoff v0.2.0

service/controller/app/resource/configmap/resource.go

@@ -3,6 +3,7 @@ package configmap
 import (
 	"reflect"
 
+	"github.com/ghodss/yaml"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 	corev1 "k8s.io/api/core/v1"
@@ -90,7 +91,24 @@ func equals(a, b *corev1.ConfigMap) bool {
 	if !reflect.DeepEqual(a.Annotations, b.Annotations) {
 		return false
 	}
-	if !reflect.DeepEqual(a.Data, b.Data) {
+
+	var source, dest map[string]interface{}
+	{
+		source = make(map[string]interface{})
+		dest = make(map[string]interface{})
+
+		err := yaml.Unmarshal([]byte(a.Data["values"]), &source)
+		if err != nil {
+			return false
+		}
+
+		err = yaml.Unmarshal([]byte(b.Data["values"]), &dest)
+		if err != nil {
+			return false
+		}
+	}
+
+	if !reflect.DeepEqual(source, dest) {
 		return false
 	}
 	if !reflect.DeepEqual(a.Labels, b.Labels) {

service/controller/app/resource/secret/resource.go

@@ -3,6 +3,7 @@ package secret
 import (
 	"reflect"
 
+	"github.com/ghodss/yaml"
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 	corev1 "k8s.io/api/core/v1"
@@ -90,7 +91,24 @@ func equals(a, b *corev1.Secret) bool {
 	if !reflect.DeepEqual(a.Annotations, b.Annotations) {
 		return false
 	}
-	if !reflect.DeepEqual(a.Data, b.Data) {
+
+	var source, dest map[string]interface{}
+	{
+		source = make(map[string]interface{})
+		dest = make(map[string]interface{})
+
+		err := yaml.Unmarshal(a.Data["values"], &source)
+		if err != nil {
+			return false
+		}
+
+		err = yaml.Unmarshal(b.Data["values"], &dest)
+		if err != nil {
+			return false
+		}
+	}
+
+	if !reflect.DeepEqual(source, dest) {
 		return false
 	}
 	if !reflect.DeepEqual(a.Labels, b.Labels) {