debug

openkruise · Apr 1, 2022 · ca20411 · ca20411
1 parent b354bf2
commit ca20411
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/e2e-1.23.yaml b/.github/workflows/e2e-1.23.yaml
@@ -37,57 +37,57 @@ jobs:
           export IMAGE="openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID}"
           docker build --pull --no-cache . -t $IMAGE
           kind load docker-image --name=${KIND_CLUSTER_NAME} $IMAGE || { echo >&2 "kind not installed or error loading image: $IMAGE"; exit 1; }
-      - name: Install Kruise Rollout
+      - name: Install Kruise
         run: |
           set -ex
           kubectl cluster-info
-          IMG=openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
+          make helm
+          helm repo add openkruise https://openkruise.github.io/charts/
+          helm repo update
+          helm install kruise openkruise/kruise
           for ((i=1;i<10;i++));
           do
             set +e
-            PODS=$(kubectl get pod -n kruise-rollout | grep '1/1' | wc -l)
+            PODS=$(kubectl get pod -n kruise-system | grep '1/1' | grep kruise-controller-manager | wc -l)
             set -e
-            if [ "$PODS" -eq "1" ]; then
+            if [ "$PODS" -eq "2" ]; then
               break
             fi
             sleep 3
           done
           set +e
-          PODS=$(kubectl get pod -n kruise-rollout | grep '1/1' | wc -l)
-          kubectl get node -o yaml
-          kubectl get all -n kruise-rollout -o yaml
+          PODS=$(kubectl get pod -n kruise-system | grep '1/1' | grep kruise-controller-manager | wc -l)
           set -e
-          if [ "$PODS" -eq "1" ]; then
-            echo "Wait for kruise-rollout ready successfully"
+          if [ "$PODS" -eq "2" ]; then
+            echo "Wait for kruise-manager ready successfully"
           else
-            echo "Timeout to wait for kruise-rollout ready"
+            echo "Timeout to wait for kruise-manager ready"
             exit 1
           fi
-      - name: Install Kruise
+      - name: Install Kruise Rollout
         run: |
           set -ex
           kubectl cluster-info
-          make helm
-          helm repo add openkruise https://openkruise.github.io/charts/
-          helm repo update
-          helm install kruise openkruise/kruise
+          IMG=openkruise/kruise-rollout:e2e-${GITHUB_RUN_ID} ./scripts/deploy_kind.sh
           for ((i=1;i<10;i++));
           do
             set +e
-            PODS=$(kubectl get pod -n kruise-system | grep '1/1' | grep kruise-controller-manager | wc -l)
+            PODS=$(kubectl get pod -n kruise-rollout | grep '1/1' | wc -l)
             set -e
-            if [ "$PODS" -eq "2" ]; then
+            if [ "$PODS" -eq "1" ]; then
               break
             fi
             sleep 3
           done
           set +e
-          PODS=$(kubectl get pod -n kruise-system | grep '1/1' | grep kruise-controller-manager | wc -l)
+          PODS=$(kubectl get pod -n kruise-rollout | grep '1/1' | wc -l)
+          kubectl get node -o yaml
+          kubectl get all -n kruise-rollout -o yaml
           set -e
-          if [ "$PODS" -eq "2" ]; then
-            echo "Wait for kruise-manager ready successfully"
+          if [ "$PODS" -eq "1" ]; then
+            echo "Wait for kruise-rollout ready successfully"
           else
-            echo "Timeout to wait for kruise-manager ready"
+            echo "Timeout to wait for kruise-rollout ready"
             exit 1
           fi
       - name: Run E2E Tests

diff --git a/pkg/controller/rollout/canary.go b/pkg/controller/rollout/canary.go
@@ -174,12 +174,12 @@ func (r *rolloutContext) doCanaryUpgrade() (bool, error) {
 	if batch.Status.CanaryStatus.CurrentBatchState != rolloutv1alpha1.ReadyBatchState ||
 		batch.Status.CanaryStatus.CurrentBatch+1 != canaryStatus.CurrentStepIndex {
 		klog.Infof("rollout(%s/%s) batch(%s) state(%s), and wait a moment",
-			r.rollout.Namespace, r.rollout.Name, r.workload.Name, batchData, batch.Status.CanaryStatus.CurrentBatchState)
+			r.rollout.Namespace, r.rollout.Name, batchData, batch.Status.CanaryStatus.CurrentBatchState)
 		return false, nil
 	}
 	r.recorder.Eventf(r.rollout, corev1.EventTypeNormal, "Progressing", fmt.Sprintf("upgrade step(%d) canary pods with new versions done", canaryStatus.CurrentStepIndex))
-	klog.Infof("rollout(%s/%s) workload(%s) batch(%s) state(%s), and success",
-		r.rollout.Namespace, r.rollout.Name, r.workload.Name, batchData, batch.Status.CanaryStatus.CurrentBatchState)
+	klog.Infof("rollout(%s/%s) batch(%s) state(%s), and success",
+		r.rollout.Namespace, r.rollout.Name, batchData, batch.Status.CanaryStatus.CurrentBatchState)
 	return true, nil
 }