feat: bug fix and deal with secrets

kubesphere · Oct 29, 2024 · 0a1cf01 · 0a1cf01
1 parent 760fe34
commit 0a1cf01
Show file tree

Hide file tree

Showing 5 changed files with 284 additions and 121 deletions.
diff --git a/build/kk/Dockerfile b/build/kk/Dockerfile
@@ -33,7 +33,7 @@ FROM alpine:3.19.0
 WORKDIR /kubekey
 
 # install tool
-RUN apk update && apk add bash && apk add curl && apk add openssl
+RUN apk update && apk add bash && apk add curl && apk add openssl && apk add sudo
 RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
      chmod 700 get_helm.sh && \
      ./get_helm.sh

diff --git a/pkg/apis/capkk/v1beta1/kkcluster_types.go b/pkg/apis/capkk/v1beta1/kkcluster_types.go
@@ -28,10 +28,11 @@ type KKClusterPhase string
 
 // const defines current Phase of KKCluster.
 const (
-	KKClusterPhasePending KKClusterPhase = "Pending"
-	KKClusterPhaseSucceed KKClusterPhase = "Succeed"
-	KKClusterPhaseRunning KKClusterPhase = "Running"
-	KKClusterPhaseFailed  KKClusterPhase = "Failed"
+	KKClusterPhasePending  KKClusterPhase = "Pending"
+	KKClusterPhaseSucceed  KKClusterPhase = "Succeed"
+	KKClusterPhaseRunning  KKClusterPhase = "Running"
+	KKClusterPhaseFailed   KKClusterPhase = "Failed"
+	KKClusterPhaseDeleting KKClusterPhase = "Deleting"
 )
 
 // NodeSelectorMode defines selector function during select cluster nodes.
@@ -128,6 +129,19 @@ const (
 	ClusterReadyReason string = "ClusterReady"
 	// ClusterReadyMessage is a specification `Message` of ClusterReadyCondition.
 	ClusterReadyMessage string = "Cluster is ready."
+
+	// ClusterDeletingCondition will delete the cluster.
+	ClusterDeletingCondition clusterv1.ConditionType = "ClusterDeletingCondition"
+	// WaitingClusterDeletingReason is one `Reason` of ClusterDeletingCondition.
+	WaitingClusterDeletingReason string = "WaitingForClusterDeleting"
+	// WaitingClusterDeletingMessage is a specification `Message` of ClusterDeletingCondition.
+	WaitingClusterDeletingMessage string = "Waiting for cluster deletion"
+	// ClusterDeletingSucceedReason is one `Reason` of ClusterDeletingCondition.
+	ClusterDeletingSucceedReason string = "ClusterDeletingSucceeded"
+	// ClusterDeletingFailedReason is one `Reason` of ClusterDeletingCondition.
+	ClusterDeletingFailedReason string = "ClusterDeletingFailed"
+	// ClusterDeletingSucceedMessage is a specification `Message` of ClusterDeletingCondition.
+	ClusterDeletingSucceedMessage string = "Cluster deletion succeeded"
 )
 
 const (