From 97bed570b1a9a9f7d5f4f518e8278894a1d5a36f Mon Sep 17 00:00:00 2001
From: steven <lwpk110@163.com>
Date: Tue, 12 Nov 2024 14:56:48 +0800
Subject: [PATCH] refactor(Makefile): update chainsaw setup and Helm targets in
 Makefile (#103)

Description:
This PR refactors the Helm targets and updates the chainsaw setup in the Makefile. The changes include:

- Removed helm-install and helm-uninstall targets.
- Updated chainsaw-setup target to use helm-install-depends instead of helm-install.

Purpose:
1. Refactor chainsaw test to rely on the helm-install-depends task for better modularity and dependency management.
2. Ensure the current operator uses the deploy task for deployment, aligning with the updated setup process.

These changes improve the modularity, clarity, and maintainability of the Makefile, making it easier to manage Helm dependencies and the chainsaw setup process.
---
 Makefile                             | 21 ++++++++++++---------
 test/e2e/kerberos/chainsaw-test.yaml | 17 +++++++++++++++++
 test/e2e/setup/hdfs-assert.yaml      |  4 ++--
 test/e2e/setup/hdfs.yaml             |  2 +-
 test/e2e/setup/zookeeper-assert.yaml |  8 ++++----
 test/e2e/setup/zookeeper.yaml        |  2 +-
 6 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 28aeb62..56f39d8 100644
--- a/Makefile
+++ b/Makefile
@@ -369,13 +369,14 @@ ifneq ($(strip $(HELM_DEPENDS)),)
 	done
 endif
 
-.PHONY: helm-install
-helm-install: helm-install-depends ## Install the helm chart.
-	$(HELM) upgrade --install --create-namespace --namespace $(TEST_NAMESPACE) --wait $(PROJECT_NAME) kubedoop/$(PROJECT_NAME) --version $(VERSION)
-
-.PHONY: helm-uninstall
-helm-uninstall: ## Uninstall the helm chart.
-	$(HELM) uninstall --namespace $(TEST_NAMESPACE) $(PROJECT_NAME)
+## helm uninstall depends
+.PHONY: helm-uninstall-depends
+helm-uninstall-depends: ## Uninstall the helm chart depends.
+ifneq ($(strip $(HELM_DEPENDS)),)
+	for dep in $(HELM_DEPENDS); do \
+		$(HELM) uninstall --namespace $(TEST_NAMESPACE) $$dep; \
+	done
+endif
 
 # kind
 KIND_VERSION ?= v0.24.0
@@ -448,7 +449,8 @@ $(CHAINSAW): $(LOCALBIN)
 chainsaw-setup: ## Run the chainsaw setup
 	make docker-build
 	$(KIND) --name $(KIND_CLUSTER_NAME) load docker-image $(IMG)
-	KUBECONFIG=$(KIND_KUBECONFIG) make helm-install
+	KUBECONFIG=$(KIND_KUBECONFIG) make helm-install-depends
+	KUBECONFIG=$(KIND_KUBECONFIG) make deploy
 
 .PHONY: chainsaw-test
 chainsaw-test: chainsaw ## Run the chainsaw test
@@ -456,4 +458,5 @@ chainsaw-test: chainsaw ## Run the chainsaw test
 
 .PHONY: chainsaw-cleanup
 chainsaw-cleanup: ## Run the chainsaw cleanup
-	KUBECONFIG=$(KIND_KUBECONFIG) make helm-uninstall
+	KUBECONFIG=$(KIND_KUBECONFIG) make helm-uninstall-depends
+	KUBECONFIG=$(KIND_KUBECONFIG) make undeploy
diff --git a/test/e2e/kerberos/chainsaw-test.yaml b/test/e2e/kerberos/chainsaw-test.yaml
index 00ec6b9..e9bbc5c 100644
--- a/test/e2e/kerberos/chainsaw-test.yaml
+++ b/test/e2e/kerberos/chainsaw-test.yaml
@@ -123,6 +123,23 @@ spec:
     cleanup:
     - sleep:
         duration: 10s
+    catch:
+      - sleep:
+          duration: 5s
+      - script:
+          env:
+            - name: NAMESPACE
+              value: ($namespace)
+          content: |
+            set -ex
+            kubectl -n $NAMESPACE get pods
+      - describe:
+          apiVersion: v1
+          kind: Pod
+          selector: app.kubernetes.io/managed-by=hdfs-operator
+      - podLogs:
+          selector: app.kubernetes.io/managed-by=hdfs-operator
+          tail: -1
   - try:
     - apply:
         file: hbase.yaml
diff --git a/test/e2e/setup/hdfs-assert.yaml b/test/e2e/setup/hdfs-assert.yaml
index 57c959c..57c0904 100644
--- a/test/e2e/setup/hdfs-assert.yaml
+++ b/test/e2e/setup/hdfs-assert.yaml
@@ -31,5 +31,5 @@ kind: StatefulSet
 metadata:
   name: hdfs-default-datanode
 status:
-  availableReplicas: 2
-  replicas: 2
+  availableReplicas: 1
+  replicas: 1
diff --git a/test/e2e/setup/hdfs.yaml b/test/e2e/setup/hdfs.yaml
index 27c4759..fe20e41 100644
--- a/test/e2e/setup/hdfs.yaml
+++ b/test/e2e/setup/hdfs.yaml
@@ -63,7 +63,7 @@ spec:
   dataNode:
     roleGroups:
       default:
-        replicas: 2
+        replicas: 1
         config:
           logging:
             datanode:
diff --git a/test/e2e/setup/zookeeper-assert.yaml b/test/e2e/setup/zookeeper-assert.yaml
index e3976f0..904b012 100644
--- a/test/e2e/setup/zookeeper-assert.yaml
+++ b/test/e2e/setup/zookeeper-assert.yaml
@@ -3,7 +3,7 @@ kind: StatefulSet
 metadata:
   name: zk-server-default
 status:
-  availableReplicas: 3
-  readyReplicas: 3
-  currentReplicas: 3
-  replicas: 3
+  availableReplicas: 1
+  readyReplicas: 1
+  currentReplicas: 1
+  replicas: 1
diff --git a/test/e2e/setup/zookeeper.yaml b/test/e2e/setup/zookeeper.yaml
index d9f73fb..8f3e4df 100644
--- a/test/e2e/setup/zookeeper.yaml
+++ b/test/e2e/setup/zookeeper.yaml
@@ -14,7 +14,7 @@ spec:
   server:
     roleGroups:
       default:
-        replicas: 3
+        replicas: 1
         config:
           logging:
             zookeeperCluster: