openstack: Set annotation even when credentials mode is unset

Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

pkg/operator/secretannotator/openstack/reconciler.go

@@ -199,19 +199,22 @@ func (r *ReconcileCloudCredSecret) Reconcile(ctx context.Context, request reconc
 		return reconcile.Result{}, err
 	}
 
-	if mode != operatorv1.CloudCredentialsModeDefault {
-		annotation, err := utils.ModeToAnnotation(mode)
-		if err != nil {
-			r.Logger.WithError(err).Error("failed to convert operator mode to annotation")
-			return reconcile.Result{}, err
-		}
-		err = r.updateSecretAnnotations(secret, annotation)
-		if err != nil {
-			r.Logger.WithError(err).Error("errored while annotating secret")
-		}
+	// default mode is passthrough; annotate accordingly
+	if mode == operatorv1.CloudCredentialsModeDefault {
+		mode = operatorv1.CloudCredentialsModePassthrough
+	}
+
+	annotation, err := utils.ModeToAnnotation(mode)
+	if err != nil {
+		r.Logger.WithError(err).Error("failed to convert operator mode to annotation")
 		return reconcile.Result{}, err
 	}
 
+	err = r.updateSecretAnnotations(secret, annotation)
+	if err != nil {
+		r.Logger.WithError(err).Error("errored while annotating secret")
+		return reconcile.Result{}, err
+	}
 	return reconcile.Result{}, nil
 }
 

pkg/operator/secretannotator/openstack/reconciler_test.go

@@ -153,7 +153,7 @@ func TestReconcileCloudCredSecret_Reconcile(t *testing.T) {
 				name:           "empty string",
 				mode:           "",
 				existing:       nil,
-				wantAnnotation: "",
+				wantAnnotation: "passthrough",
 				wantErr:        false,
 			},
 			{

pkg/operator/utils/utils.go

@@ -205,7 +205,8 @@ func GetLegacyConfigMap(kubeClient client.Client) (*corev1.ConfigMap, error) {
 func GetOperatorConfiguration(kubeClient client.Client, logger log.FieldLogger) (
 	effectiveOperatorMode operatorv1.CloudCredentialsMode,
 	configurationConflict bool,
-	err error) {
+	err error,
+) {
 	var operatorMode operatorv1.CloudCredentialsMode
 	operatorMode, err = getOperatorMode(kubeClient, logger)
 	if err != nil {