Fix secret creation

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>
craftypath · Apr 24, 2020 · 34a2c3f · 34a2c3f
1 parent 3d48307
commit 34a2c3f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/pkg/apis/craftypath/v1alpha1/sopssecret_types.go b/pkg/apis/craftypath/v1alpha1/sopssecret_types.go
@@ -30,9 +30,9 @@ type SopsSecretSpec struct {
 
 // SopsSecretStatus defines the observed state of SopsSecret
 type SopsSecretStatus struct {
-	LastUpdate metav1.Time
-	Reason     string
-	Status     string
+	LastUpdate metav1.Time `json:"lastUpdate,omitempty"`
+	Reason     string      `json:"reason,omitempty"`
+	Status     string      `json:"status,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

diff --git a/pkg/controller/sopssecret/sopssecret_controller.go b/pkg/controller/sopssecret/sopssecret_controller.go
@@ -16,7 +16,6 @@ package sopssecret
 
 import (
 	"context"
-	"encoding/base64"
 	"fmt"
 	"math"
 	"time"
@@ -150,10 +149,7 @@ func (r *ReconcileSopsSecret) update(ctx context.Context, secret *corev1.Secret,
 		if err != nil {
 			return err
 		}
-		logger(ctx).V(1).Info("base64-encoding data", "fileName", fileName)
-		buf := make([]byte, base64.StdEncoding.EncodedLen(len(decrypted)))
-		base64.StdEncoding.Encode(buf, decrypted)
-		data[fileName] = buf
+		data[fileName] = decrypted
 	}
 
 	secret.ObjectMeta.Annotations = sopsSecret.Annotations
@@ -211,6 +207,10 @@ func (r *ReconcileSopsSecret) manageError(ctx context.Context, instance *craftyp
 func (r *ReconcileSopsSecret) manageSuccess(ctx context.Context, instance *craftypathv1alpha1.SopsSecret, result controllerutil.OperationResult) (reconcile.Result, error) {
 	logger(ctx).V(1).Info("handling reconciliation success")
 
+	if result == controllerutil.OperationResultNone {
+		return reconcile.Result{}, nil
+	}
+
 	status := craftypathv1alpha1.SopsSecretStatus{
 		LastUpdate: metav1.Now(),
 		Reason:     "",