fix(chore): address comments from review

Signed-off-by: Piotr Skamruk <piotr.skamruk@gmail.com>

Author: jellonek

docs/user-guides/cluster/offboarding.md

@@ -37,7 +37,7 @@ Off-board a `Cluster` in Greenhouse is initiated by calling the command:
 kubectl --namespace=<greenhouse-organization-name> delete cluster <cluster-name>
 ```
 
-Another option to trigger `Cluster` off-boarding is manual deleting the cluster `Secret`, what can be done by calling the command:
+Another option to trigger `Cluster` off-boarding is manually deleting the cluster `Secret`, which can be done by calling the command:
 ```shell
 kubectl --namespace=<greenhouse-organization-name> delete secret <cluster-name>
 ```

e2e/cluster/e2e_test.go

@@ -140,19 +140,16 @@ var _ = Describe("Cluster E2E", Ordered, func() {
 			By("getting cluster secret")
 			secret := &corev1.Secret{}
 			err := adminClient.Get(ctx, client.ObjectKey{Name: remoteClusterHName, Namespace: env.TestNamespace}, secret)
-			if apierrors.IsNotFound(err) {
-				return
-			}
 			Expect(err).NotTo(HaveOccurred())
 
 			By("removing the secret resource")
 			err = adminClient.Delete(ctx, secret)
-			Expect(err).NotTo(HaveOccurred())
+			Expect(err).NotTo(HaveOccurred(), "cluster secret should exist")
 
 			By("checking the cluster resource is eventually deleted")
 			cluster := &greenhousev1alpha1.Cluster{}
 			Eventually(func(g Gomega) {
-				err := adminClient.Get(ctx, client.ObjectKey{Name: name, Namespace: namespace}, cluster)
+				err := adminClient.Get(ctx, client.ObjectKey{Name: remoteClusterHName, Namespace: env.TestNamespace}, cluster)
 				g.Expect(apierrors.IsNotFound(err)).To(BeTrue(), "cluster resource should be deleted")
 			}).Should(Succeed(), "cluster resource should be deleted")
 		})

internal/controller/cluster/bootstrap_controller.go

@@ -226,7 +226,7 @@ func (r *BootstrapReconciler) requestClusterDeletion(ctx context.Context, namesp
 	if err := r.Get(ctx, namespacedName, &cluster); err != nil {
 		return client.IgnoreNotFound(err)
 	}
-	log.FromContext(ctx).Info("KubeConfig secret for Cluster %s not found, requesting Cluster deletion", namespacedName.String())
+	log.FromContext(ctx).Info("Cluster secret not found, requesting Cluster deletion", "cluster", namespacedName.String())
 	return client.IgnoreNotFound(r.Delete(ctx, &cluster))
 }
 

internal/controller/cluster/bootstrap_controller_test.go

@@ -140,7 +140,7 @@ var _ = Describe("Bootstrap controller", Ordered, func() {
 			By("Deleting the kubeconfig secret and checking the cluster is deleted")
 			test.MustDeleteCluster(test.Ctx, test.K8sClient, cluster)
 		})
-		It("Should remove cluster when secret disapears", func() {
+		It("Should remove cluster when secret disappears", func() {
 			By("Creating a kubeconfig secret with label")
 			kubeConfigSecret := setup.CreateSecret(test.Ctx, bootstrapTestCase+"-secret-removal",
 				test.WithSecretType(greenhouseapis.SecretTypeKubeConfig),
@@ -157,9 +157,9 @@ var _ = Describe("Bootstrap controller", Ordered, func() {
 			test.MustDeleteSecret(test.Ctx, test.K8sClient, kubeConfigSecret)
 
 			Eventually(func(g Gomega) bool {
-				g.Expect(apierrors.IsNotFound(test.K8sClient.Get(test.Ctx, id, cluster))).Should(BeTrue(), "the cluster should have been created")
+				g.Expect(apierrors.IsNotFound(test.K8sClient.Get(test.Ctx, id, cluster))).Should(BeTrue(), "the cluster should be deleted")
 				return true
-			}).Should(BeTrue(), "getting the cluster should succeed eventually")
+			}).Should(BeTrue(), "the cluster should be deleted eventually")
 		})
 	})
 })