Merge secret stringData into data before applying (#314)

* merge secret stringData into data before applying

* go mod tidy

Author: cbarbian-sap

pkg/reconciler/reconciler.go

@@ -282,6 +282,21 @@ func (r *Reconciler) Apply(ctx context.Context, inventory *[]*InventoryItem, obj
 		return false, errors.Wrap(err, "error normalizing objects")
 	}
 
+	// merge secret stringData into data; this is required/better because server-side-apply does not work well
+	// with stringData
+	for _, object := range objects {
+		if isSecret(object) {
+			secret := object.(*corev1.Secret)
+			for k, v := range secret.StringData {
+				if secret.Data == nil {
+					secret.Data = make(map[string][]byte)
+				}
+				secret.Data[k] = []byte(v)
+			}
+			secret.StringData = nil
+		}
+	}
+
 	// perform cleanup on object manifests
 	for _, object := range objects {
 		removeLabel(object, r.labelKeyOwnerId)

pkg/reconciler/util.go

@@ -128,6 +128,10 @@ func isApiService(key types.ObjectKey) bool {
 	return key.GetObjectKind().GroupVersionKind().GroupKind() == schema.GroupKind{Group: "apiregistration.k8s.io", Kind: "APIService"}
 }
 
+func isSecret(key types.ObjectKey) bool {
+	return key.GetObjectKind().GroupVersionKind().GroupKind() == schema.GroupKind{Group: "", Kind: "Secret"}
+}
+
 func getCrds(objects []client.Object) []*apiextensionsv1.CustomResourceDefinition {
 	var crds []*apiextensionsv1.CustomResourceDefinition
 	for _, object := range objects {