chore: rm kerberos e2e

lwpk110 · Jul 8, 2024 · 0e9b17e · 0e9b17e
1 parent 4afc2e6
commit 0e9b17e
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 461 deletions.
diff --git a/internal/controller/cluster.go b/internal/controller/cluster.go
@@ -60,6 +60,7 @@ func (c *ClusterReconciler) ReconcileCluster(ctx context.Context) (ctrl.Result,
 	c.preReconcile()
 
 	// reconcile resource of cluster level
+	c.Log.Info("Reconciling cluster resource")
 	if len(c.resourceReconcilers) > 0 {
 		res, err := common.ReconcilerDoHandler(ctx, c.resourceReconcilers)
 		if err != nil {
@@ -71,6 +72,7 @@ func (c *ClusterReconciler) ReconcileCluster(ctx context.Context) (ctrl.Result,
 	}
 
 	//reconcile role
+	c.Log.Info("Reconciling role resource")
 	for _, r := range c.roleReconcilers {
 		res, err := r.ReconcileRole(ctx)
 		if err != nil {
@@ -81,7 +83,8 @@ func (c *ClusterReconciler) ReconcileCluster(ctx context.Context) (ctrl.Result,
 		}
 	}
 
-	// reconcile discovery
+	// reconcile discovery\
+	c.Log.Info("Reconciling discovery resource")
 	res, err := c.ReconcileDiscovery(ctx)
 	if err != nil {
 		return ctrl.Result{}, err

diff --git a/internal/controller/discovery.go b/internal/controller/discovery.go
@@ -46,7 +46,7 @@ func NewDiscovery(
 func (d *Discovery) Build(ctx context.Context) (client.Object, error) {
 	return &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      d.Instance.GetName() + "-discovery",
+			Name:      d.Instance.GetName(),
 			Namespace: d.Instance.Namespace,
 			Labels:    d.MergedLabels,
 		},

diff --git a/internal/controller/hdfscluster_controller.go b/internal/controller/hdfscluster_controller.go
@@ -72,10 +72,11 @@ func (r *HdfsClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	result, err := NewClusterReconciler(r.Client, r.Scheme, cr).ReconcileCluster(ctx)
 	if err != nil {
 		return ctrl.Result{}, err
+	} else if result.RequeueAfter > 0 {
+		return result, nil
 	}
-
-	r.Log.Info("Successfully reconciled HdfsCluster")
-	return result, nil
+	r.Log.Info("Reconcile successfully ", "Name", cr.Name)
+	return ctrl.Result{}, nil
 }
 
 // UpdateStatus updates the status of the HdfsCluster resource

diff --git a/test/e2e/default/03-secret.yaml b/test/e2e/default/03-secret.yaml
diff --git a/test/e2e/default/04-assert.yaml b/test/e2e/default/04-assert.yaml
@@ -20,5 +20,4 @@ metadata:
   name: hdfscluster-sample-default-datanode
 status:
   availableReplicas: 2
-  replicas: 2
-
+  replicas: 2
diff --git a/test/e2e/default/04-hdfs.yaml b/test/e2e/default/04-hdfs.yaml
@@ -15,9 +15,6 @@ spec:
     tag: 3.3.4
   clusterConfig:
     zookeeperDiscoveryZNode: sample-hdfs-znode
-    authentication:
-      kerberos:
-        secretClass: hdfs-kerberos
   nameNode:
     roleGroups:
       default:

diff --git a/test/e2e/kerberos/00-assert.yaml b/test/e2e/kerberos/00-assert.yaml
diff --git a/test/e2e/kerberos/00-olm.yaml b/test/e2e/kerberos/00-olm.yaml
diff --git a/test/e2e/kerberos/01-assert.yaml b/test/e2e/kerberos/01-assert.yaml
diff --git a/test/e2e/kerberos/01-subs.yaml b/test/e2e/kerberos/01-subs.yaml
diff --git a/test/e2e/kerberos/02-assert.yaml b/test/e2e/kerberos/02-assert.yaml
diff --git a/test/e2e/kerberos/02-listener.yaml b/test/e2e/kerberos/02-listener.yaml
diff --git a/test/e2e/kerberos/03-assert.yaml b/test/e2e/kerberos/03-assert.yaml
diff --git a/test/e2e/kerberos/03-secret.yaml b/test/e2e/kerberos/03-secret.yaml
diff --git a/test/e2e/kerberos/04-assert.yaml b/test/e2e/kerberos/04-assert.yaml