Merge pull request #13 from uselagoon/feature/fix-secret-delete

Feature/fix secret delete

controllers/namespace_controller.go

@@ -92,15 +92,15 @@ func (r *NamespaceReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		// let's verify this to make sure it looks good
 		if val, ok := v.Data["INSIGHTS_TOKEN"]; ok {
 			namespaceDetails, err := tokens.ValidateAndExtractNamespaceDetailsFromToken(r.InsightsJWTSecret, string(val))
-
 			if err != nil {
-				log.Error(err, "Unable to decode token")
-				return ctrl.Result{}, err
+				// If we can't validate this secret, we should really just recreate it
+				deleteSecretMessage = fmt.Sprintf("Token is invalid - namespaces '%v'!='%v'.", ns.GetName(), namespaceDetails.Namespace)
 			}
-			if namespaceDetails.Namespace != ns.GetName() {
+			if deleteSecretMessage != "" && namespaceDetails.Namespace != ns.GetName() {
 				deleteSecretMessage = fmt.Sprintf("Token is invalid - namespaces '%v'!='%v'.", ns.GetName(), namespaceDetails.Namespace)
+			} else {
+				foundItem = true
 			}
-			foundItem = true
 		} else {
 			//we delete this secret straight
 			deleteSecretMessage = "key INSIGHTS_TOKEN does not exist. Secret is invalid."