From 45dc0de0abe0569e9870f2f3b47e22a6fc23908c Mon Sep 17 00:00:00 2001 From: Erin Corson Date: Mon, 9 Sep 2019 18:48:03 -0600 Subject: [PATCH] one more change --- controllers/sqlserver_controller.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/controllers/sqlserver_controller.go b/controllers/sqlserver_controller.go index 36d9a02d28c..f6ec55099b9 100644 --- a/controllers/sqlserver_controller.go +++ b/controllers/sqlserver_controller.go @@ -144,7 +144,6 @@ func (r *SqlServerReconciler) reconcileExternal(instance *azurev1.SqlServer) err } // Check to see if secret already exists for admin username/password - var checkForSecretsErr error secret := &v1.Secret{ ObjectMeta: metav1.ObjectMeta{ Name: name, @@ -159,11 +158,10 @@ func (r *SqlServerReconciler) reconcileExternal(instance *azurev1.SqlServer) err Type: "Opaque", } - checkForSecretsErr = r.Get(context.Background(), types.NamespacedName{Name: name, Namespace: instance.Namespace}, secret) // If secret doesn't exist, generate creds // Note: sql server enforces password policy. Details can be found here: // https://docs.microsoft.com/en-us/sql/relational-databases/security/password-policy?view=sql-server-2017 - if checkForSecretsErr == nil { + if err := r.Get(context.Background(), types.NamespacedName{Name: name, Namespace: instance.Namespace}, secret); err != nil { r.Log.Info("secret already exists, pulling creds now") sqlServerProperties.AdministratorLogin = to.StringPtr(string(secret.Data["username"])) sqlServerProperties.AdministratorLoginPassword = to.StringPtr(string(secret.Data["password"]))