@@ -873,7 +873,7 @@ func (r *KeystoneAPIReconciler) reconcileNormal(
873873 //
874874 // Validate the CA cert secret if provided
875875 if instance .Spec .TLS .CaBundleSecretName != "" {
876- hash , ctrlResult , err := tls .ValidateCACertSecret (
876+ hash , err := tls .ValidateCACertSecret (
877877 ctx ,
878878 helper .GetClient (),
879879 types.NamespacedName {
@@ -882,20 +882,21 @@ func (r *KeystoneAPIReconciler) reconcileNormal(
882882 },
883883 )
884884 if err != nil {
885+ if k8s_errors .IsNotFound (err ) {
886+ instance .Status .Conditions .Set (condition .FalseCondition (
887+ condition .TLSInputReadyCondition ,
888+ condition .RequestedReason ,
889+ condition .SeverityInfo ,
890+ fmt .Sprintf (condition .TLSInputReadyWaitingMessage , instance .Spec .TLS .CaBundleSecretName )))
891+ return ctrl.Result {}, nil
892+ }
885893 instance .Status .Conditions .Set (condition .FalseCondition (
886894 condition .TLSInputReadyCondition ,
887895 condition .ErrorReason ,
888896 condition .SeverityWarning ,
889897 condition .TLSInputErrorMessage ,
890898 err .Error ()))
891- return ctrlResult , err
892- } else if (ctrlResult != ctrl.Result {}) {
893- instance .Status .Conditions .Set (condition .FalseCondition (
894- condition .TLSInputReadyCondition ,
895- condition .RequestedReason ,
896- condition .SeverityInfo ,
897- fmt .Sprintf (condition .TLSInputReadyWaitingMessage , instance .Spec .TLS .CaBundleSecretName )))
898- return ctrlResult , nil
899+ return ctrl.Result {}, err
899900 }
900901
901902 if hash != "" {
@@ -904,22 +905,23 @@ func (r *KeystoneAPIReconciler) reconcileNormal(
904905 }
905906
906907 // Validate API service certs secrets
907- certsHash , ctrlResult , err := instance .Spec .TLS .API .ValidateCertSecrets (ctx , helper , instance .Namespace )
908+ certsHash , err := instance .Spec .TLS .API .ValidateCertSecrets (ctx , helper , instance .Namespace )
908909 if err != nil {
910+ if k8s_errors .IsNotFound (err ) {
911+ instance .Status .Conditions .Set (condition .FalseCondition (
912+ condition .TLSInputReadyCondition ,
913+ condition .RequestedReason ,
914+ condition .SeverityInfo ,
915+ fmt .Sprintf (condition .TLSInputReadyWaitingMessage , err .Error ())))
916+ return ctrl.Result {}, nil
917+ }
909918 instance .Status .Conditions .Set (condition .FalseCondition (
910919 condition .TLSInputReadyCondition ,
911920 condition .ErrorReason ,
912921 condition .SeverityWarning ,
913922 condition .TLSInputErrorMessage ,
914923 err .Error ()))
915- return ctrlResult , err
916- } else if (ctrlResult != ctrl.Result {}) {
917- instance .Status .Conditions .Set (condition .FalseCondition (
918- condition .TLSInputReadyCondition ,
919- condition .RequestedReason ,
920- condition .SeverityInfo ,
921- fmt .Sprintf (condition .TLSInputReadyWaitingMessage , "one or more cert secrets" )))
922- return ctrlResult , nil
924+ return ctrl.Result {}, err
923925 }
924926 configMapVars [tls .TLSHashName ] = env .SetValue (certsHash )
925927
@@ -975,7 +977,7 @@ func (r *KeystoneAPIReconciler) reconcileNormal(
975977 }
976978
977979 // Handle service init
978- ctrlResult , err = r .reconcileInit (ctx , instance , helper , serviceLabels , serviceAnnotations )
980+ ctrlResult , err : =r .reconcileInit (ctx , instance , helper , serviceLabels , serviceAnnotations )
979981 if err != nil {
980982 return ctrlResult , err
981983 } else if (ctrlResult != ctrl.Result {}) {
0 commit comments