Merge pull request #500 from stuggi/check_err

Do not ignore err on GetSecret()
openstack-k8s-operators · Oct 9, 2024 · 0fd60c8 · 0fd60c8
2 parents a9bf21a + b392b0a
commit 0fd60c8
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/controllers/ceilometer_controller.go b/controllers/ceilometer_controller.go
@@ -818,8 +818,15 @@ func (r *CeilometerReconciler) generateServiceConfig(
 		return err
 	}
 
-	transportURLSecret, _, _ := secret.GetSecret(ctx, h, instance.CeilometerStatus.TransportURLSecret, instance.Namespace)
-	ceilometerPasswordSecret, _, _ := secret.GetSecret(ctx, h, instance.Spec.Secret, instance.Namespace)
+	transportURLSecret, _, err := secret.GetSecret(ctx, h, instance.CeilometerStatus.TransportURLSecret, instance.Namespace)
+	if err != nil {
+		return err
+	}
+
+	ceilometerPasswordSecret, _, err := secret.GetSecret(ctx, h, instance.Spec.Secret, instance.Namespace)
+	if err != nil {
+		return err
+	}
 
 	templateParameters := map[string]interface{}{
 		"KeystoneInternalURL": keystoneInternalURL,
@@ -891,8 +898,15 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(
 		return err
 	}
 
-	transportURLSecret, _, _ := secret.GetSecret(ctx, h, instance.CeilometerStatus.TransportURLSecret, instance.Namespace)
-	ceilometerPasswordSecret, _, _ := secret.GetSecret(ctx, h, instance.Spec.Secret, instance.Namespace)
+	transportURLSecret, _, err := secret.GetSecret(ctx, h, instance.CeilometerStatus.TransportURLSecret, instance.Namespace)
+	if err != nil {
+		return err
+	}
+
+	ceilometerPasswordSecret, _, err := secret.GetSecret(ctx, h, instance.Spec.Secret, instance.Namespace)
+	if err != nil {
+		return err
+	}
 
 	templateParameters := map[string]interface{}{
 		"KeystoneInternalURL":      keystoneInternalURL,