driver will now check if secretObjects is an empty list before perfor…

…ming syncAll operations
kubernetes-sigs · Aug 21, 2021 · f552f0f · f552f0f
1 parent 5ba6d82
commit f552f0f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/controllers/secretproviderclasspodstatus_controller.go b/controllers/secretproviderclasspodstatus_controller.go
@@ -174,7 +174,11 @@ func (r *SecretProviderClassPodStatusReconciler) Patcher(ctx context.Context) er
 			if err != nil {
 				klog.ErrorS(err, "failed to get mounted files", "spc", klog.KObj(spc), "pod", klog.KObj(pod), "spcps", klog.KObj(&spcPodStatus))
 			} else {
-				spc.Spec.SecretObjects = spcutil.BuildSecretObjects(files, secretutil.GetSecretType(strings.TrimSpace(spc.Spec.SyncOptions.Type)))
+				if len(spc.Spec.SecretObjects) == 0 {
+					spc.Spec.SecretObjects = spcutil.BuildSecretObjects(files, secretutil.GetSecretType(strings.TrimSpace(spc.Spec.SyncOptions.Type)))
+				} else {
+					spc.Spec.SecretObjects = append(spc.Spec.SecretObjects, spcutil.BuildSecretObjects(files, secretutil.GetSecretType(strings.TrimSpace(spc.Spec.SyncOptions.Type)))...)
+				}
 			}
 		}
 
@@ -297,7 +301,11 @@ func (r *SecretProviderClassPodStatusReconciler) Reconcile(ctx context.Context,
 	files, err := fileutil.GetMountedFiles(spcPodStatus.Status.TargetPath)
 
 	if spc.Spec.SyncOptions.SyncAll {
-		spc.Spec.SecretObjects = spcutil.BuildSecretObjects(files, secretutil.GetSecretType(strings.TrimSpace(spc.Spec.SyncOptions.Type)))
+		if len(spc.Spec.SecretObjects) == 0 {
+			spc.Spec.SecretObjects = spcutil.BuildSecretObjects(files, secretutil.GetSecretType(strings.TrimSpace(spc.Spec.SyncOptions.Type)))
+		} else {
+			spc.Spec.SecretObjects = append(spc.Spec.SecretObjects, spcutil.BuildSecretObjects(files, secretutil.GetSecretType(strings.TrimSpace(spc.Spec.SyncOptions.Type)))...)
+		}
 	}
 
 	for _, secretObj := range spc.Spec.SecretObjects {

diff --git a/pkg/rotation/reconciler.go b/pkg/rotation/reconciler.go
@@ -437,7 +437,11 @@ func (r *Reconciler) reconcile(ctx context.Context, spcps *v1alpha1.SecretProvid
 	files, err := fileutil.GetMountedFiles(spcps.Status.TargetPath)
 
 	if spc.Spec.SyncOptions.SyncAll {
-		spc.Spec.SecretObjects = spcutil.BuildSecretObjects(files, secretutil.GetSecretType(strings.TrimSpace(spc.Spec.SyncOptions.Type)))
+		if len(spc.Spec.SecretObjects) == 0 {
+			spc.Spec.SecretObjects = spcutil.BuildSecretObjects(files, secretutil.GetSecretType(strings.TrimSpace(spc.Spec.SyncOptions.Type)))
+		} else {
+			spc.Spec.SecretObjects = append(spc.Spec.SecretObjects, spcutil.BuildSecretObjects(files, secretutil.GetSecretType(strings.TrimSpace(spc.Spec.SyncOptions.Type)))...)
+		}
 	}
 
 	for _, secretObj := range spc.Spec.SecretObjects {

diff --git a/pkg/util/secretutil/secret.go b/pkg/util/secretutil/secret.go
@@ -131,7 +131,7 @@ type basicAuthCreds struct {
 // getCredentials parses the mounted content and returns the required
 // key-value pairs for a kubernetes.io/basic-auth K8s secret
 func getCredentials(data []byte) basicAuthCreds {
-	credentials := strings.Split(string(data), ";")
+	credentials := strings.Split(string(data), ",")
 	return basicAuthCreds{
 		Username: credentials[0],
 		Password: credentials[1],

diff --git a/pkg/util/spcutil/secret_object_data.go b/pkg/util/spcutil/secret_object_data.go
@@ -102,7 +102,7 @@ func createDockerConfigJsonSecretDataObject(key string) *v1alpha1.SecretObject {
 		Type:       string(corev1.SecretTypeDockerConfigJson),
 		Data: []*v1alpha1.SecretObjectData{
 			{
-				ObjectName: setKey(key),
+				ObjectName: key,
 				Key:        dockerConfigJsonKey,
 			},
 		},
@@ -135,7 +135,8 @@ func createSSHSecretDataObject(key string) *v1alpha1.SecretObject {
 	}
 }
 
-func setKey(key string) string {
+// setSecretName sets the name of a secret to the value of "objectName" separated by "-"
+func setSecretName(key string) string {
 	nested := strings.Split(key, "/")
 
 	if len(nested) > 0 {
@@ -145,7 +146,8 @@ func setKey(key string) string {
 	return key
 }
 
-func setSecretName(key string) string {
+// setKey sets the key of a secret to the name of the mounted file
+func setKey(key string) string {
 	nested := strings.Split(key, "/")
 
 	if len(nested) > 0 {